commit 7c3dec0679c66ce177726802adbe2f403942fc27 tree 62d286f0b477a62d6996b6ba2cacdc3cdd4579a9 parent c80dc60b03d633047c7f96be87fd59cdcdbb929f author Linus Torvalds Mon, 10 Jul 2006 22:21:43 -0700 committer Linus Torvalds Mon, 10 Jul 2006 22:21:43 -0700 x86 MacMini: make built-in speaker sound actually work The MacMini board table seems to largely look like any bog-standard Intel 945 board. Signed-off-by: Linus Torvalds commit c80dc60b03d633047c7f96be87fd59cdcdbb929f tree 1ef931c2287e376f8fef37cea89f7a951d9d3b00 parent 90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab parent 0466684907ea1695eeef98cb28ca3399882ecc0a author Linus Torvalds Mon, 10 Jul 2006 15:14:38 -0700 committer Linus Torvalds Mon, 10 Jul 2006 15:14:38 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: ACPI_DOCK: Initialize the atomic notifier list ACPI: acpi_os_allocate() fixes ACPI: SBS: fix initialization, sem2mutex ACPI: add 'const' to several ACPI file_operations ACPI: delete some defaults from ACPI Kconfig ACPI: "Device `[%s]' is not power manageable" make message debug only ACPI: ACPI_DOCK Kconfig Revert "Revert "ACPI: dock driver"" ACPI: acpi_os_get_thread_id() returns current ACPI: ACPICA 20060707 commit 90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab tree c671df0bd9fa1a13da69ec57e3fdda1385e59729 parent 2c87e2cd0b57f63c226cd51f55ccc36867541a24 parent 9faefb6d41f770e9cebad0fa180e7e78ef861211 author Linus Torvalds Mon, 10 Jul 2006 15:13:53 -0700 committer Linus Torvalds Mon, 10 Jul 2006 15:13:53 -0700 Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD * HEAD: [DCCP]: Fix sparse warnings. [TCP]: Remove TCP Compound [BPQ] lockdep: fix false positive [IPV4] inetpeer: Get rid of volatile from peer_total [AX.25]: Get rid of the last volatile. commit 2c87e2cd0b57f63c226cd51f55ccc36867541a24 tree 78de73e00823aa0b29ebc2570e67207f42f957f0 parent 1cfcea1b2d67987ddb84dc75f454321bcf536555 author Andi Kleen Mon, 10 Jul 2006 17:06:24 +0200 committer Linus Torvalds Mon, 10 Jul 2006 15:12:33 -0700 [PATCH] x86_64: Fix access check in ptrace compat We can't safely directly access an compat_alloc_user_space() pointer with the siginfo copy functions. Bounce it through the stack. Noticed by Al Viro using sparse [ This was only added post 2.6.17, not in any released kernel ] Cc: Al Viro Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1cfcea1b2d67987ddb84dc75f454321bcf536555 tree 0a64e00386cafff9c55cd675927a00064f3d4cd3 parent 46f6976101c359202422753d15955f67aafabe2b author Andi Kleen Mon, 10 Jul 2006 17:06:21 +0200 committer Linus Torvalds Mon, 10 Jul 2006 15:12:33 -0700 [PATCH] x86_64: Allow oprofile for model P4 models Add it for P4 model 6 - reported to work and have a similar PMU to earlier P4s. Add an p4force=1 module override parameter for future use. We had a discussion about that earlier - it's a trade off between the PMU staying compatible or not. I think the force parameter is a reasonable compromise. Cc: oprofile-list@lists.sf.net Cc: Asit Mallick Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 46f6976101c359202422753d15955f67aafabe2b tree f251e6132f3a5640086770f0b6f1d95344102e02 parent aa0a9f373e3edb2c090f3fa0eb292712cfa97f81 author Andi Kleen Mon, 10 Jul 2006 17:06:18 +0200 committer Linus Torvalds Mon, 10 Jul 2006 15:12:33 -0700 [PATCH] x86_64: Fix up bogus defaults in ACPI Kconfig No need for video to be always in No need for smart battery driver to be always in Acked-by: Len Brown Cc: linux-acpi@vger.kernel.org Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit aa0a9f373e3edb2c090f3fa0eb292712cfa97f81 tree f1a72c7f87eecc4679718e8a753fadca910d4ad8 parent 77dac90fe4c3d05917045169ec1e3dbc589c0865 author Muli Ben-Yehuda Mon, 10 Jul 2006 17:06:15 +0200 committer Linus Torvalds Mon, 10 Jul 2006 15:12:33 -0700 [PATCH] x86_64: Fix Calgary copyright statements per IBM guidelines Signed-off-by: Muli Ben-Yehuda Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 77dac90fe4c3d05917045169ec1e3dbc589c0865 tree 2c3962acfd7f008cb8a4cb4a3116f452746ba021 parent 0d2caebd562a20188a0d7f4e4f516b7ed69f319e author Muli Ben-Yehuda Mon, 10 Jul 2006 17:06:12 +0200 committer Linus Torvalds Mon, 10 Jul 2006 15:12:32 -0700 [PATCH] x86_64: Add a MAINTAINERS entry for Calgary Signed-off-by: Muli Ben-Yehuda Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0d2caebd562a20188a0d7f4e4f516b7ed69f319e tree 9be87dd69e5309024aac0241d42cedcfa1c8e794 parent 3391c22e5b6aaeb289bcc1ad0d5b3f2ba5421f22 author Jacob Shin Mon, 10 Jul 2006 17:06:09 +0200 committer Linus Torvalds Mon, 10 Jul 2006 15:12:32 -0700 [PATCH] x86_64: Fix hotplug problem in mce amd Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3391c22e5b6aaeb289bcc1ad0d5b3f2ba5421f22 tree 2fe664aea3492f5e8afeab95298fb67aa1813096 parent d5d8ad78b05d13c658aae8f4b06b6d339f13fd58 author Markus Schoder Mon, 10 Jul 2006 17:06:06 +0200 committer Linus Torvalds Mon, 10 Jul 2006 15:12:32 -0700 [PATCH] x86_64: Bring x86-64 ia32 emul in sync with i386 on READ_IMPLIES_EXEC enabling Currently ia32 binaries behave differently with respect to enabling READ_IMPLIES_EXEC. On i386 a binary with the exec_stack flag set is executed with READ_IMPLIES_EXEC enabled as well. The same binary executes without READ_IMPLIES_EXEC on x86-64. This causes binaries that work on i386 to fail on x86-64 which goes somewhat against the whole 32 bit emulation idea. It has been argued that READ_IMPLIES_EXEC should not be enabled at all for binaries that have the exec_stack flag. Which is probably a valid point. However until this is clarified I think x86-64 should behave the same for ia32 binaries as i386. The following patch brings x86-64 in sync with i386 for ia32 binaries. Signed-off-by: Markus Schoder Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d5d8ad78b05d13c658aae8f4b06b6d339f13fd58 tree 00a50ac9aa3e53e3a94cc8145321b2b832573263 parent e2b209509ca33743864846aef2e1b2afc21f7915 author Andi Kleen Mon, 10 Jul 2006 17:06:03 +0200 committer Linus Torvalds Mon, 10 Jul 2006 15:12:32 -0700 [PATCH] x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9faefb6d41f770e9cebad0fa180e7e78ef861211 tree 4a0670d0496613bab015d732fb35ec7bc048c77d parent c427d27452b41378e305af80db5757da048dd38e author Alan Cox Mon, 10 Jul 2006 14:24:23 -0700 committer David S. Miller Mon, 10 Jul 2006 14:50:37 -0700 [DCCP]: Fix sparse warnings. No actual bugs that I can see just a couple of unmarked casts getting annoying in my debug log files. Signed-off-by: Alan Cox Signed-off-by: David S. Miller commit c427d27452b41378e305af80db5757da048dd38e tree d2c07b903b14610e629ee91a163ea01cf4775177 parent 1eeb7e42888b3bde403596eebdbd64452a53f4d5 author David S. Miller Mon, 10 Jul 2006 14:16:32 -0700 committer David S. Miller Mon, 10 Jul 2006 14:50:35 -0700 [TCP]: Remove TCP Compound This reverts: f890f921040fef6a35e39d15b729af1fd1a35f29 The inclusion of TCP Compound needs to be reverted at this time because it is not 100% certain that this code conforms to the requirements of Developer's Certificate of Origin 1.1 paragraph (b). Signed-off-by: David S. Miller commit 1eeb7e42888b3bde403596eebdbd64452a53f4d5 tree 3d7c7fc76b61a4ecceaf03c206336bce96ddeb28 parent 7466d90f858ad89dda6f47b744e0a839937907a3 author Ralf Baechle Mon, 10 Jul 2006 11:24:46 -0700 committer David S. Miller Mon, 10 Jul 2006 14:50:33 -0700 [BPQ] lockdep: fix false positive Bpqether is encapsulating AX.25 frames into ethernet frames. There is a virtual bpqether device paired with each ethernet devices, so it's normal to pass through dev_queue_xmit twice for each frame which triggers the locking detector. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 7466d90f858ad89dda6f47b744e0a839937907a3 tree 1718f61cd2019ef3f1fc9ae50aeb0ef0d864352c parent bde3445c562dc72f0003550ba30db1e39be10366 author Herbert Xu Sun, 09 Jul 2006 18:18:00 -0700 committer David S. Miller Mon, 10 Jul 2006 14:50:30 -0700 [IPV4] inetpeer: Get rid of volatile from peer_total The variable peer_total is protected by a lock. The volatile marker makes no sense. This shaves off 20 bytes on i386. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bde3445c562dc72f0003550ba30db1e39be10366 tree b68bf71be9eaaba056c9ef44ab4673b979cab403 parent e2b209509ca33743864846aef2e1b2afc21f7915 author Ralf Baechle Sun, 09 Jul 2006 18:16:44 -0700 committer David S. Miller Mon, 10 Jul 2006 14:50:28 -0700 [AX.25]: Get rid of the last volatile. This volatile makes no sense - not even wearing pink shades ... Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit e2b209509ca33743864846aef2e1b2afc21f7915 tree 19e7ed73049af78d6c605b326cc433034a2cd50c parent cd6b3956e9923915da789df1c665976b5583cfb0 author Shankar Anand Mon, 10 Jul 2006 04:45:44 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:27 -0700 [PATCH] knfsd: nfsd4: add per-operation server stats Add an nfs4 operations count array to nfsd_stats structure. The count is incremented in nfsd4_proc_compound() where all the operations are handled by the nfsv4 server. This count of individual nfsv4 operations is also entered into /proc filesystem. Signed-off-by: Shankar Anand Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd6b3956e9923915da789df1c665976b5583cfb0 tree dee12341df825c3ea7106dae921b80fc1364762f parent 2c16e9c888985761511bd1905b00fb271169c3c0 author Eric Sesterhenn Mon, 10 Jul 2006 04:45:43 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:27 -0700 [PATCH] isdn: cleanup i_rdev udage Signed-off-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c16e9c888985761511bd1905b00fb271169c3c0 tree e17756b3ed27b0f4953547c39cf46864cdd6f818 parent e54695a59c278b9ff48cd4b263da7a1d392f5061 author Arjan van de Ven Mon, 10 Jul 2006 04:45:42 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:27 -0700 [PATCH] lockdep: disable lock debugging when kernel state becomes untrusted Disable lockdep debugging in two situations where the integrity of the kernel no longer is guaranteed: when oopsing and when hitting a tainting-condition. The goal is to not get weird lockdep traces that don't make sense or are otherwise undebuggable, to not waste time. Lockdep assumes that the previous state it knows about is valid to operate, which is why lockdep turns itself off after the first violation it reports, after that point it can no longer make that assumption. A kernel oops means that the integrity of the kernel compromised; in addition anything lockdep would report is of lesser importance than the oops. All the tainting conditions are of similar integrity-violating nature and also make debugging/diagnosing more difficult. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e54695a59c278b9ff48cd4b263da7a1d392f5061 tree f6c0fa15fd07c8cca42a20c29fb087ee4be5903f parent e62c23c751b5136ed52ac324ecf78a814e2d2fe3 author Andrew Morton Mon, 10 Jul 2006 04:45:42 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:27 -0700 [PATCH] checklist update Update Documentation/SubmitChecklist. - Mention lockdep coverage - Describe documentation requirements - Number the various items to simplify the composition of caustic emails. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e62c23c751b5136ed52ac324ecf78a814e2d2fe3 tree c6b6d97eb4dd22685eefb89e3d48f1dbe342f7e3 parent c59923a15c12d2b3597af913bf234a0ef264a38b author Adrian Bunk Mon, 10 Jul 2006 04:45:40 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:26 -0700 [PATCH] proper prototype for drivers/message/i2o/device.c:i2o_parm_issue() Add a proper prototype for i2o_parm_issue() in core.h. Signed-off-by: Adrian Bunk Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c59923a15c12d2b3597af913bf234a0ef264a38b tree b501b52309d68e711b7e162b570c16e535922d32 parent f84dfe82962759f3355eacc8e377361bb77b5274 author Christoph Hellwig Mon, 10 Jul 2006 04:45:40 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:26 -0700 [PATCH] remove the tasklist_lock export As announced half a year ago this patch will remove the tasklist_lock export. The previous two patches got rid of the remaining modular users. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f84dfe82962759f3355eacc8e377361bb77b5274 tree 300bdc6e0551457ebc84f4cdfe1c292960a62409 parent 289fbc21ea5ac445dfb4326090b1912387e849b5 author Heiko Carstens Mon, 10 Jul 2006 04:45:39 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:26 -0700 [PATCH] s390: remove BINFMT_ELF32 config option Remove BINFMT_ELF32 config option. Support should be always compiled in if CONFIG_COMPAT is set. Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 289fbc21ea5ac445dfb4326090b1912387e849b5 tree 893156586eb506d45110f51976749433f70e8e34 parent 5c318bef5f61baf6bbda2dcfe8c2ef71007c7fea author Christoph Hellwig Mon, 10 Jul 2006 04:45:38 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:26 -0700 [PATCH] disallow modular binfmt_elf32 Currently most architectures either always build binfmt_elf32 in the kernel image or make it a boolean option. Only sparc64 and s390 allow to build it modularly. This patch turns the option into a boolean aswell because elf requires various symbols that shouldn't be available to modules. The most urgent one is tasklist_lock whos export this patch series kills, but there are others like force_sgi aswell. Note that sparc doesn't allow a modular 32bit a.out handler either, and that would be the more useful case as only few people want 32bit sunos compatibility and 99.9% of all sparc64 users need 32bit linux native elf support. Signed-off-by: Christoph Hellwig Acked-by: "David S. Miller" Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c318bef5f61baf6bbda2dcfe8c2ef71007c7fea tree 3a477d54979e26a0f21921703740df6436e0578c parent babcfade47371eea81fd7f24d892b5ff5b1786ea author Christoph Hellwig Mon, 10 Jul 2006 04:45:37 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:26 -0700 [PATCH] snsc: switch from force_sig to kill_proc Currently the snsc driver uses force_sig to send init a SIGPWR when the system overheats. This patch switches it to kill_proc instead which has the following advantages: (1) gets rid of one of the last remaining tasklist_lock users in modular code (2) simplifies the snsc code significantly The downside is that an init implementation could in theory block SIGPWR and it would not get delivered. The sysvinit code used by all major distributions doesn't do this and blocking this signal in init would be a rather stupid thing to do. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit babcfade47371eea81fd7f24d892b5ff5b1786ea tree a0b5f1ce6d0ab758f78a35a1e8fd0ce07c8572f3 parent 27385085f19a9bc9b147905554e6e2509fdaceb2 author Jim Cromie Mon, 10 Jul 2006 04:45:37 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:26 -0700 [PATCH] pc8736x_gpio: fix re-modprobe errors: fix/finish cdev-init - Switch from register_chrdev() to (register|alloc)_chrdev_region(). - use a cdev. This was intended for original patchset, but was overlooked. We use a single cdev for all pins (minor device-numbers), as gleaned from cs5535_gpio, and in contrast to whats currently done in scx200_gpio (which I'll fix soon) Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27385085f19a9bc9b147905554e6e2509fdaceb2 tree 07a4308f9e29bfae55d6c6cc0119794f9f8fe993 parent 4f197842d0f3dd994882407f8760f2eda9005191 author Jim Cromie Mon, 10 Jul 2006 04:45:36 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:26 -0700 [PATCH] pc8736x_gpio: fix re-modprobe errors: undo region reservation Fix module-init-func by repairing usage of platform_device_del/put in module-exit-func. IOW, it imitates Ingo's 'mishaps' patch, which fixed the module-init-func's undo handling. Also fixes lack of release_region to undo the earlier registration. Also starts to 'use a cdev' which was originally intended (its present in scx200_gpio). Code compiles and runs, exhibits a lesser error than previously. (re-register-chrdev fails) Since I had to add "include ", I went ahead and made 2 tweaks that fell into diff-context-window: - remove include everyone's doing it - copyright updates - current date is 'wrong' Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f197842d0f3dd994882407f8760f2eda9005191 tree 3eed7508d8ae1df7aabbaea3f80f6520c695f54d parent 1a87d9425e0347c0e880254816d8e9f41a0e2b0c author Jim Cromie Mon, 10 Jul 2006 04:45:35 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:26 -0700 [PATCH] pc8736x_gpio: fix re-modprobe errors: define and use constants add constant defines - preparatory patch - adds #define CONSTs for max-pin, gpio-addr-range (for reserving region) - fix wrong max-pin check in gpio_open() - add 'Winbond' to module description. NSC sold the product, Winbond has supported us / lm-sensors Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a87d9425e0347c0e880254816d8e9f41a0e2b0c tree 9a7bc51f81413c565eaaf6bac27810424ae8cf8e parent 36cf96f5e7c098731a1ad9d79694d6f591b18e7f author Chris Boot Mon, 10 Jul 2006 04:45:34 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:26 -0700 [PATCH] LED Class support for Soekris net48xx Add LED Class device support for the Soekris net48xx Error LED. Tested only on a net4801, but should work on a net4826 as well. I'd love to find a way of detecting a Soekris net48xx device but there is no DMI or any Soekris-specific PCI devices. [akpm@osdl.org: fixlets, cleanups] Signed-off-by: Chris Boot Cc: Ben Dooks Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36cf96f5e7c098731a1ad9d79694d6f591b18e7f tree 589037fc024c7ccf5aa5a291f011ebcb4a683c42 parent 2017b376c01a54bf7d26ad4f461abe9b5f9064fe author Andreas Gruenbacher Mon, 10 Jul 2006 04:45:33 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:26 -0700 [PATCH] Remove leftover ext3 acl declarations These functions no longer exist; remove their declarations. Signed-off-by: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2017b376c01a54bf7d26ad4f461abe9b5f9064fe tree 93c90bbb544f88911cc8dc6f52c3caa3248b9286 parent 21d71f513b6221f482ed6ad45e05f073ae67f319 author Eric Sesterhenn Mon, 10 Jul 2006 04:45:32 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:25 -0700 [PATCH] aoe: cleanup i_rdev usage Signed-off-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21d71f513b6221f482ed6ad45e05f073ae67f319 tree 4b890613d46adce1391be4c5c954f5042968ba85 parent 92eb7a2f28d551acedeb5752263267a64b1f5ddf author Ingo Molnar Mon, 10 Jul 2006 04:45:32 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:25 -0700 [PATCH] uninline init_waitqueue_head() allyesconfig vmlinux size delta: text data bss dec filename 20736884 6073834 3075176 29885894 vmlinux.before 20721009 6073966 3075176 29870151 vmlinux.after ~18 bytes per callsite, 15K of text size (~0.1%) saved. (as an added bonus this also removes a lockdep annotation.) Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92eb7a2f28d551acedeb5752263267a64b1f5ddf tree e77b0dee5598df8f44a6f57783a3344e2e4e98c1 parent 38e0e8c0550eaed1af48ec5ad9ddb8a25e8b04ae author Andrew Morton Mon, 10 Jul 2006 04:45:31 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:25 -0700 [PATCH] fix weird logic in alloc_fdtable() There's a fairly obvious infinite loop in there. Also, use roundup_pow_of_two() rather than open-coding stuff. Cc: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38e0e8c0550eaed1af48ec5ad9ddb8a25e8b04ae tree f38daa22e42969c8eabccfd73dc298dcaec99821 parent 06c67befeeb16f2995c11b0e04a348103ddbfab1 author Maciej W. Rozycki Mon, 10 Jul 2006 04:45:30 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:25 -0700 [PATCH] char/rtc: Handle memory-mapped chips properly Handle memory-mapped chips properly, needed for example on DECstations. This support was in Linux 2.4 but for some reason got lost in 2.6. This patch is taken directly from the linux-mips repository. [akpm@osdl.org: cleanup] Signed-off-by: Maciej W. Rozycki Signed-off-by: Martin Michlmayr Cc: Paul Gortmaker Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06c67befeeb16f2995c11b0e04a348103ddbfab1 tree aad64fa9d2d03b1479885d1c703ccc5890b12afe parent 49c0dab7e6000888b616bedcbbc8cd4710331610 author Lennert Buytenhek Mon, 10 Jul 2006 04:45:27 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:25 -0700 [PATCH] make valid_mmap_phys_addr_range() take a pfn Newer ARMs have a 40 bit physical address space, but mapping physical memory above 4G needs a special page table format which we (currently?) do not use for userspace mappings, so what happens instead is that mapping an address >= 4G will happily discard the upper bits and wrap. There is a valid_mmap_phys_addr_range() arch hook where we could check for >= 4G addresses and deny the mapping, but this hook takes an unsigned long address: static inline int valid_mmap_phys_addr_range(unsigned long addr, size_t size); And drivers/char/mem.c:mmap_mem() calls it like this: static int mmap_mem(struct file * file, struct vm_area_struct * vma) { size_t size = vma->vm_end - vma->vm_start; if (!valid_mmap_phys_addr_range(vma->vm_pgoff << PAGE_SHIFT, size)) So that's not much help either. This patch makes the hook take a pfn instead of a phys address. Signed-off-by: Lennert Buytenhek Cc: Bjorn Helgaas Cc: "Luck, Tony" Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49c0dab7e6000888b616bedcbbc8cd4710331610 tree 41f1d5e4b1978843b240f3812d3039e9ef9a17b1 parent 68e3c5e3b5c29ea76152dc1d1482826434d45019 author Doug Thompson Mon, 10 Jul 2006 04:45:19 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:25 -0700 [PATCH] Fix and enable EDAC sysfs operation When EDAC was first introduced into the kernel it had a sysfs interface, but due to some problems it was disabled in 2.6.16 and remained disabled in 2.6.17. With feedback, several of the control and attribute files of that interface had some good constructive feedback. PCI Blacklist/Whitelist was a major set which has design issues and it has been removed in this patch. Instead of storing PCI broken parity status in EDAC, it has been moved to the pci_dev structure itself by a previous PCI patch. A future patch will enable that feature in EDAC by utilizing the pci_dev info. The sysfs is now enabled in this patch, with a minimal set of control and attribute files for examining EDAC state and for enabling/disabling the memory and PCI operations. The Documentation for EDAC has also been updated to reflect the new state of EDAC operation. Signed-off-by:Doug Thompson Cc: Greg KH Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68e3c5e3b5c29ea76152dc1d1482826434d45019 tree 010388a2733b9209912f7540934736d5a859b0e3 parent f1c0a578ca960d10fce049765bb9e5a53fb53d2e author Dave Jones Mon, 10 Jul 2006 04:45:18 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:25 -0700 [PATCH] s390: broken null test in claw driver Whoops, better hope this never gets passed a null dev in its current state. Signed-off-by: Dave Jones Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Michael Holzheu Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1c0a578ca960d10fce049765bb9e5a53fb53d2e tree 2d1d42d490a71919e634418a5cf94ce23137b127 parent 9c4b9a9b553794d81cc8a335dac270ac86fd7798 author Dave Jones Mon, 10 Jul 2006 04:45:18 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:25 -0700 [PATCH] fix oddball boolean logic in s390 netiucv Signed-off-by: Dave Jones Cc: Heiko Carstens Cc: Andreas Herrmann Cc: Michael Holzheu Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c4b9a9b553794d81cc8a335dac270ac86fd7798 tree 2f4825681bdf62aea8953179980c4e0326c77254 parent 2d77f6fcf841261796f01cba19b4ea1ad8713936 author Serge E. Hallyn Mon, 10 Jul 2006 04:45:17 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:24 -0700 [PATCH] s390: move var declarations behind ifdef Two variables in drivers/s390/net/qeth_main.c:qeth_send_packet() are only used if CONFIG_QETH_PERF_STATS. Move their definition under the same ifdef to remove compiler warning. Signed-off-by: Serge Hallyn Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d77f6fcf841261796f01cba19b4ea1ad8713936 tree 4a6d2cc0d241c408d0b65b1a5aead845d8072caa parent 03a3f824eae944e9d3649cbccf874e7fbe228477 author Jeff Dike Mon, 10 Jul 2006 04:45:16 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:24 -0700 [PATCH] uml: make mconsole version requests happen in a process Handling a host mconsole version request must be done in a process context rather than interrupt context now that utsname information can be process-specific rather than global. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03a3f824eae944e9d3649cbccf874e7fbe228477 tree 133e48bd0580fe7a567d910d08928cff43278f6a parent 9ead6feedd28091d86cde0843be914847b4e10e8 author Jeff Dike Mon, 10 Jul 2006 04:45:15 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:24 -0700 [PATCH] uml: remove unused variable The dedevfsification of UML left an unused variable behind. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ead6feedd28091d86cde0843be914847b4e10e8 tree d477bd385e04d77d74823dbbaa4c840c235a5630 parent 108ffa8cbfa323d462a2f4b49f38da3205d36e5a author Jeff Dike Mon, 10 Jul 2006 04:45:15 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:24 -0700 [PATCH] uml: add some EINTR protection Add some more uses of the CATCH_EINTR wrapper. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 108ffa8cbfa323d462a2f4b49f38da3205d36e5a tree a9474c48ff4da341ce296b9b26da70dd5bba0fd2 parent 1d3468a6643a6a5905e2ac9ae1fa1aefc06d882a author Jeff Dike Mon, 10 Jul 2006 04:45:14 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:24 -0700 [PATCH] uml: formatting fixes Fix a bunch of formatting problems. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d3468a6643a6a5905e2ac9ae1fa1aefc06d882a tree 9f605490ab72b8027e9f5e0d4c9626516d8a73c5 parent 469226a431f553a7b3ec17d87ce3c2d1c6c25fb2 author Jeff Dike Mon, 10 Jul 2006 04:45:13 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:24 -0700 [PATCH] uml: move _kern.c files Move most *_kern.c files in arch/um/kernel to *.c. This makes UML somewhat more closely resemble the other arches. [akpm@osdl.org: use the new INTF_* flags] Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 469226a431f553a7b3ec17d87ce3c2d1c6c25fb2 tree 4fa99835c10b4bc70e259c5b42e07ade4388fb26 parent 29ac1c2142346e1e0e072f41df31688fc42ff540 author Jeff Dike Mon, 10 Jul 2006 04:45:13 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:24 -0700 [PATCH] uml: remove syscall debugging Eliminate an unused debug option. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29ac1c2142346e1e0e072f41df31688fc42ff540 tree e859dc5361070c1ea360aaf3c55af976ad5211e1 parent 61232f2fe44f7ac12d7512d099a8f10923eff7ea author Jeff Dike Mon, 10 Jul 2006 04:45:12 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:24 -0700 [PATCH] uml: make some symbols static A few sigio-related things can be made static. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61232f2fe44f7ac12d7512d099a8f10923eff7ea tree f1f17d310daf7f5b60ad6713a7a1ac7011ae45e8 parent 8e64d96aeb495709c13307e2d79f3ee37e96aa4e author Jeff Dike Mon, 10 Jul 2006 04:45:11 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:24 -0700 [PATCH] uml: fix exitcall ordering bug This fixes an exitcall ordering bug - calls to ignore_sigio_fd can come from exitcalls that come after the sigio thread has been killed. This would cause shutdown to hang or crash. Fixed by having ignore_sigio_fd check that the thread is present before trying to communicate with it. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e64d96aeb495709c13307e2d79f3ee37e96aa4e tree 41532136fdd081d561343be876d3068464821910 parent bfaafd7184f044c63cd937cb0ffb4334b4ec7635 author Jeff Dike Mon, 10 Jul 2006 04:45:11 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:24 -0700 [PATCH] uml: remove os_isatty os_isatty can be made to disappear by moving maybe_sigio_broken from kernel to user code. This also lets write_sigio_workaround become static. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfaafd7184f044c63cd937cb0ffb4334b4ec7635 tree 3c5d70d6fc2e5d8d3975daedb34e208eadab105a parent 8ae43ff8aa60f81f5d82a4911d704ce8902d11fb author Jeff Dike Mon, 10 Jul 2006 04:45:10 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:23 -0700 [PATCH] uml: remove spinlock wrapper functions The irq_spinlock is not needed from user code any more, so the irq_lock and irq_unlock wrappers can go away. This also changes the name of the lock to irq_lock. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ae43ff8aa60f81f5d82a4911d704ce8902d11fb tree 6aced5cef586796d00e939bcac8c2dcbd3efceaf parent bacf4549187ddb624a5d89129c7dccc0ca67ce7c author Jeff Dike Mon, 10 Jul 2006 04:45:09 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:23 -0700 [PATCH] uml: mark forward_interrupts as being mode-specific Mark forward_interrupts as being tt-mode only. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bacf4549187ddb624a5d89129c7dccc0ca67ce7c tree 8f93edf174930b43c1e15da3459fa0bbd9dc2276 parent 872aaa65a6ef30edef05a89977f7021f9840b215 author Jeff Dike Mon, 10 Jul 2006 04:45:09 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:23 -0700 [PATCH] uml: ifdef a mode-specific function uml_idle_timer is tt-mode only, so ifdef it as such to make it easier to spot when tt mode is killed. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 872aaa65a6ef30edef05a89977f7021f9840b215 tree d6402a26830dc2c5f48d6f9ec48069e3c0e784a7 parent e64bd134085451fe3f751025c5d5a70729164b7c author Jeff Dike Mon, 10 Jul 2006 04:45:08 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:23 -0700 [PATCH] uml: timer handler tidying Get rid of a user of timer_irq_inited (and first_tick) by observing that prev_ticks can be used to decide if this is the first call. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e64bd134085451fe3f751025c5d5a70729164b7c tree 547aaa97aa3a8226b2c028c56adc9671477131b8 parent 9914aee827322f46c306d724b38ad73af7daa9a5 author Jeff Dike Mon, 10 Jul 2006 04:45:07 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:23 -0700 [PATCH] uml: signal initialization cleanup It turns out that init_new_thread_signals is always called with altstack == 1, so we can eliminate the parameter. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9914aee827322f46c306d724b38ad73af7daa9a5 tree b59dd961ced14122946156576e6518cce88d1d8f parent 23bbd586ed7894982fd9323f63b2065afbb77773 author Jeff Dike Mon, 10 Jul 2006 04:45:07 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:23 -0700 [PATCH] uml: remove useless declaration wall_to_monotonic isn't used in this file, so we can remove the declaration. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23bbd586ed7894982fd9323f63b2065afbb77773 tree 6fec4b69d2c4bafd134efc886f700654606c56fe parent 8633c2331e738218c7356633e1c4adb75726225f author Jeff Dike Mon, 10 Jul 2006 04:45:06 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:23 -0700 [PATCH] uml: fix static binary segfault When UML is built as a static binary, it segfaults when run. The reason is that a memory hole that is present in dynamic binaries isn't there in static binaries, and it contains essential stuff. This fix removes the code which maps some anonymous memory into that hole and cleans up some related code. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8633c2331e738218c7356633e1c4adb75726225f tree 6d557fb242194cbf9146d1691121c926eff23255 parent aceb343464a136e1c0de5294b097a1f9ab018870 author Jeff Dike Mon, 10 Jul 2006 04:45:05 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:23 -0700 [PATCH] uml: remove some useless exports Spotted by Al Viro - eliminate a couple useless exports. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aceb343464a136e1c0de5294b097a1f9ab018870 tree db42e6d7b059948b3ef0d957fb9dcc87462c7fd3 parent 598d188af1a0645dc75c9541eff0017a4f6d9987 author Jeff Dike Mon, 10 Jul 2006 04:45:05 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:23 -0700 [PATCH] uml: timer initialization cleanup This cleans up the mess that is the timer initialization. There used to be two timer handlers - one that basically ran during delay loop calibration and one that handled the timer afterwards. There were also two sets of timer initialization code - one that starts in user code and calls into the kernel side of the house, and one that starts in kernel code and calls user code. This eliminates one timer handler and consolidates the two sets of initialization code. [akpm@osdl.org: use new INTF_ flags] Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 598d188af1a0645dc75c9541eff0017a4f6d9987 tree ffbc9704b361ca01cf4a1817cc02b4b82e86f4ea parent 5f49d7247828bd2d992cf9bd78e5e33a421fb0ba author Tyler Mon, 10 Jul 2006 04:45:03 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:23 -0700 [PATCH] uml: clean up address space limits code I was looking at the code of the UML and more precisely at the functions set_task_sizes_tt and set_task_sizes_skas. I noticed that these 2 functions take a paramater (arg) which is not used : the function is always called with the value 0. I suppose that this value might change in the future (or even can be configured), so I added a constant in mem_user.h file. Also, I rounded CONFIG_HOST_TASk_SIZE to a 4M. Signed-off-by: Tyler Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f49d7247828bd2d992cf9bd78e5e33a421fb0ba tree fdf01bdc3f2943aff1bf3289ffd3a4aa3b417cea parent 32ea086b7b6423e8ab1874389741bcef4d50f938 author Irwan Djajadi Mon, 10 Jul 2006 04:45:02 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:22 -0700 [PATCH] pcf8563: remove MOD_INC_USE_COUNT, MOD_DEC_USE_COUNT It already has .owner. Signed-off-by: Irwan Djajadi Signed-off-by: Alexey Dobriyan Cc: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32ea086b7b6423e8ab1874389741bcef4d50f938 tree f506440c23d41b6c65d5b131b399f75465dab42f parent aeceb15738958fe59cd9fe537f40317b1a3bc731 author Eric Sesterhenn Mon, 10 Jul 2006 04:45:02 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:22 -0700 [PATCH] cris: switch to iminor/imajor Signed-off-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Cc: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aeceb15738958fe59cd9fe537f40317b1a3bc731 tree 98ab1b493886dbd03eace4ebe6cde335b3523e00 parent 712f403af6682c942d8ff8bfbd54eed03643a796 author Linus Torvalds Mon, 10 Jul 2006 04:45:01 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:22 -0700 [PATCH] swsusp: fix panic when signature can't be read Do not panic a machine when swsusp signature can't be read. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 712f403af6682c942d8ff8bfbd54eed03643a796 tree fa5c018f024906a231f0c018a3639b977c0d4af6 parent 95018f7c94cbe4e78fc014b6ce52004714c06e2a author Andrew Morton Mon, 10 Jul 2006 04:45:00 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:22 -0700 [PATCH] swsusp warning fix kernel/power/swap.c: In function 'swsusp_write': kernel/power/swap.c:275: warning: 'start' may be used uninitialized in this function gcc isn't smart enough, so help it. Cc: Pavel Machek Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95018f7c94cbe4e78fc014b6ce52004714c06e2a tree 2f8434103bc670813120e6d64b1726301a6021ac parent 7ba1c6c88c945b065a75094830f6b76f414e42ad author Rafael J. Wysocki Mon, 10 Jul 2006 04:45:00 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:22 -0700 [PATCH] swsusp: do not use memcpy for snapshotting memory swsusp should not use memcpy for snapshotting memory, because on some architectures memcpy may increase preempt_count (i386 does this when CONFIG_X86_USE_3DNOW is set). Then, as a result, wrong value of preempt_count is stored in the image. Replace memcpy in copy_data_pages with an open-coded loop. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ba1c6c88c945b065a75094830f6b76f414e42ad tree 614506c720fd4a15d6f22c03bcc7706d931dbd42 parent 11eebe307e4d3afa33eb25e999ac458ac4f9b41e author Andrew Morton Mon, 10 Jul 2006 04:44:59 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:22 -0700 [PATCH] get_cmos_time() locking fix (lockdep) rtc_lock is supposed to be irq-safe. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11eebe307e4d3afa33eb25e999ac458ac4f9b41e tree 8a5d8bd3c35ca25aed80be16b99df80d9654bac9 parent 84e8cd6dbc00b4979e8d1c15c80d91987aeb3417 author Adrian Bunk Mon, 10 Jul 2006 04:44:56 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:22 -0700 [PATCH] i386 defconfig: set CONFIG_PM_STD_PARTITION="" Matthew Wilcox notified me that CONFIG_PM_STD_PARTITION="/dev/hda2" in the i386 defconfig wasn't a good idea (especially since it prevented booting for him due to another bug). This patch sets CONFIG_PM_STD_PARTITION="" in the i386 defconfig. Signed-off-by: Adrian Bunk Cc: Matthew Wilcox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84e8cd6dbc00b4979e8d1c15c80d91987aeb3417 tree 5df8103b5e6d414bc39e165655ae8bd5341abd76 parent 6d8c4e3b0150ff537902477ed62f8a8e9e70007b author David Howells Mon, 10 Jul 2006 04:44:55 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:22 -0700 [PATCH] FRV: Introduce asm-offsets for FRV arch Introduce the use of asm-offsets into the FRV architecture. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d8c4e3b0150ff537902477ed62f8a8e9e70007b tree 0fe61afc565c4312f8a4395281186c0e54449c1c parent b4cac1a0227a6f84be0381cd350a3c8730a4a671 author David Howells Mon, 10 Jul 2006 04:44:55 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:22 -0700 [PATCH] FDPIC: Add coredump capability for the ELF-FDPIC binfmt Add coredump capability for the ELF-FDPIC binfmt. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4cac1a0227a6f84be0381cd350a3c8730a4a671 tree 24bf1aa95d1977161774210bbb9bf697ad0fe5e9 parent 01bf466e1866feeb7fce0319cbafe0166e29f5e4 author David Howells Mon, 10 Jul 2006 04:44:54 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:22 -0700 [PATCH] FDPIC: Move roundup() into linux/kernel.h Move the roundup() macro from binfmt_elf.c into linux/kernel.h as it's generally useful. [akpm@osdl.org: nuke all the other implementations] Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01bf466e1866feeb7fce0319cbafe0166e29f5e4 tree 9dc2bc9474e5bcef5628828a8b64708ec383ce74 parent 8a2ab7f5df76b920d62b908919d987d3b8a82856 author David Howells Mon, 10 Jul 2006 04:44:53 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:21 -0700 [PATCH] FDPIC: Define SEEK_* constants in the Linux kernel headers Add definitions for SEEK_SET, SEEK_CUR and SEEK_END to the kernel header files. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a2ab7f5df76b920d62b908919d987d3b8a82856 tree cad7a9ce6a131ee092fcd5ad555869b30761d377 parent 21ff821630c0e64f5d2fab96ced72000d77fa90b author David Howells Mon, 10 Jul 2006 04:44:53 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:21 -0700 [PATCH] FDPIC: Adjust the ELF-FDPIC driver to conform more to the CodingStyle Adjust the ELF-FDPIC binfmt driver to conform much more to the CodingStyle, silly though it may be. Further changes: (*) Drop the casts to long for addresses in kdebug() statements (they're unsigned long already). (*) Use extra variables to avoid expressions longer than 80 chars by splitting the statement into multiple statements and letting the compiler optimise them back together. (*) Eliminate duplicate call of ksize() when working out how much space was actually allocated for the stack. (*) Discard the commented-out load_shlib prototype and op pointer as this will not be supported in ELF-FDPIC for the foreseeable future. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21ff821630c0e64f5d2fab96ced72000d77fa90b tree 9c131cd6bf337a9da98f31703214385c07571c38 parent 9dec17eb577169f78d642c5424e4264186d27115 author David Howells Mon, 10 Jul 2006 04:44:52 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:21 -0700 [PATCH] NOMMU: Fix execution off of ramfs with mmap() Fix execution through the FDPIC binfmt of programs stored on ramfs by preventing the ramfs mmap() returning successfully on a private mapping of a ramfs file. This causes NOMMU mmap to make a copy of the mapped portion of the file and map that instead. This could be improved by granting direct mapping access to read-only private mappings for which the data is stored on a contiguous run of pages. However, this is only likely to be the case if the file was extended with truncate before being written. ramfs is left to map the file directly for shared mappings so that SYSV IPC and POSIX shared memory both still work. Signed-off-by: David Howells Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dec17eb577169f78d642c5424e4264186d27115 tree 76cff4c5a8a6d255bc457392057e775d71ff5532 parent 1aeb21d626327ee909fef03f72aea6e8a60e6c0c author David Howells Mon, 10 Jul 2006 04:44:51 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:21 -0700 [PATCH] FRV: Fix FRV arch compile errors Fix some FRV arch compile errors, including: (*) Marking nr_kernel_pages as __meminitdata so that references to it end up being properly calculated rather than being assumed to be in the small data section (and thus calculated wrt the GP register). Not doing this causes the linker to emit errors as the offset is too big to fit into the load instruction. (*) Move pm_power_off into an unconditionally compiled .c file as it's now unconditionally accessed. (*) Declare frv_change_cmode() in a header file rather than in a .c file, and declare it asmlinkage. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1aeb21d626327ee909fef03f72aea6e8a60e6c0c tree 7494b2caa2bb7d9f20d0a00a0bdb35c3c396dc51 parent b6174df5eec9cdfd598c03d6d0807e344e109213 author David Howells Mon, 10 Jul 2006 04:44:50 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:21 -0700 [PATCH] FDPIC: Fix FDPIC compile errors Fix FDPIC compile errors. (akpm: we suspect it fixes a warning) Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6174df5eec9cdfd598c03d6d0807e344e109213 tree d61c8627138a8feee31de8320e337251d567fca9 parent d6b7d3b62069be60d5b13358bac8670dacdd7a81 author Zhang, Yanmin Mon, 10 Jul 2006 04:44:49 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:21 -0700 [PATCH] mmap zero-length hugetlb file with PROT_NONE to protect a hugetlb virtual area Sometimes, applications need below call to be successful although "/mnt/hugepages/file1" doesn't exist. fd = open("/mnt/hugepages/file1", O_CREAT|O_RDWR, 0755); *addr = mmap(NULL, 0x1024*1024*256, PROT_NONE, 0, fd, 0); As for regular pages (or files), above call does work, but as for huge pages, above call would fail because hugetlbfs_file_mmap would fail if (!(vma->vm_flags & VM_WRITE) && len > inode->i_size). This capability on huge page is useful on ia64 when the process wants to protect one area on region 4, so other threads couldn't read/write this area. A famous JVM (Java Virtual Machine) implementation on IA64 needs the capability. Signed-off-by: Zhang Yanmin Cc: David Gibson Cc: Hugh Dickins [ Expand-on-mmap semantics again... this time matching normal fs's. wli ] Acked-by: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6b7d3b62069be60d5b13358bac8670dacdd7a81 tree f8f2fbdc0193d41412661aa3bd432b10822c0aef parent 82081797b7d72108a47c82997349d1ea6a3eb3d5 author Alan Stern Mon, 10 Jul 2006 04:44:47 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:21 -0700 [PATCH] usb-storage: wait for URB to complete We all failed to notice that Franck's recent update to usb-storage allowed an URB to complete after its context data was no longer valid. This patch (as746) makes the driver wait for the URB to complete whenever there's a timeout. Although timeouts in usb-storage are relatively uncommon, they do occur. Without this patch the code in 2.6.18-rc1 will fault within an interrupt handler, which is not nice at all. Signed-off-by: Alan Stern Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82081797b7d72108a47c82997349d1ea6a3eb3d5 tree 9066f303de9ad1f92d65800171eb61f05dab15d4 parent e01af0384f54023b4548b7742952da2ffcafd4cd author Linas Vepstas Mon, 10 Jul 2006 04:44:46 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:21 -0700 [PATCH] pci: initialize struct pci_dev.error_state The pci channel state is currently uninitialized, thus there are two ways of indicating that "everything's OK": 0 and 1. This is a bit of a burden. If a devce driver wants to check if the pci channel is in a working or a disconnected state, the driver writer must perform checks similar to if((pdev->error_state != 0) && (pdev->error_state != pci_channel_io_normal)) { whatever(); } which is rather akward. The first check is needed because stuct pci_dev is inited to all-zeros. The scond is needed because the error recovery will set the state to pci_channel_io_normal (which is not zero). This patch fixes this awkwardness. Signed-off-by: Linas Vepstas Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e01af0384f54023b4548b7742952da2ffcafd4cd tree 6ffd14821a0a1fedbf4430c5df7fa60822f4809f parent 58d383a6222d66be9483598c51bae34e7d3c2c37 author Michael Hanselmann Mon, 10 Jul 2006 04:44:45 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:20 -0700 [PATCH] powermac: Combined fixes for backlight code This patch fixes several problems: - pmac_backlight_key() is called under interrupt context, and therefore can't use mutexes or semaphores, so defer the backlight level for later, as it's not critical (original code by Aristeu S. Rozanski F. ). - Add exports for functions that might be called from modules - Fix Kconfig depdencies on PMAC_BACKLIGHT. - Fix locking issues on calls from inside the driver (reported by Aristeu S. Rozanski F., too) - Fix wrong calculation of backlight values in some of the drivers - Replace pmac_backlight_key_up/down by inline functions [akpm@osdl.org: fix function prototypes] Signed-off-by: Michael Hanselmann Acked-by: Aristeu S. Rozanski F. Acked-by: Rene Nussbaumer Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58d383a6222d66be9483598c51bae34e7d3c2c37 tree 54641bdccdb52635c28579c2a08aa941c813a878 parent f620753b9584558cd3bcc1712fca16663aacdce4 author Segher Boessenkool Mon, 10 Jul 2006 04:44:45 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:20 -0700 [PATCH] powerpc: make OF interrupt tree parsing more strict This patch fixes a bit of boundchecking in the new Open Firmware interrupt tree parsing code. It's important that it fails when things aren't correct in order to trigger fallback mecanisms that are necessary to make some machines work properly. Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f620753b9584558cd3bcc1712fca16663aacdce4 tree db058f90ef0ab1ee7f61576ecac5fb65615c3d82 parent 06fe98e6369330d522705d5e67a2eddac2fd5bba author Benjamin Herrenschmidt Mon, 10 Jul 2006 04:44:44 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:20 -0700 [PATCH] powerpc: fix SMU driver interrupt mapping The SMU driver tries to map an interrupt from the device-tree before the interrupt controllers in the machine have been enumerated. This doesn't work properly and cause machines like the Quad g5 to fail booting later on when some drivers waits endlessly for an SMU request to complete. This is the second problem preventing boot on the Quad g5. This fixes it and also makes the SMU driver a bit more resilient to not having an interrupt. Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06fe98e6369330d522705d5e67a2eddac2fd5bba tree f8f2e31087634f91a1d797a1c218be9c5325654a parent 6e99e4582861578fb00d84d085f8f283569f51dd author Benjamin Herrenschmidt Mon, 10 Jul 2006 04:44:43 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:20 -0700 [PATCH] powerpc: fix MPIC OF tree parsing on Apple quad g5 The quad g5 currently doesn't boot due to two problems. This patch fixes the first one: Apple new way of doing interrupt specifiers in OF for devices using the HT APIC isn't properly parsed by the new MPIC driver code. Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e99e4582861578fb00d84d085f8f283569f51dd tree 8890d540932f02fa47e49248adcc918b42c335b8 parent 50099328e4fe7c9f8981f408071a1ff82d59ddf8 author Benjamin Herrenschmidt Mon, 10 Jul 2006 04:44:42 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:20 -0700 [PATCH] powerpc: fix trigger handling in the new irq code This patch slightly reworks the new irq code to fix a small design error. I removed the passing of the trigger to the map() calls entirely, it was not a good idea to have one call do two different things. It also fixes a couple of corner cases. Mapping a linux virtual irq to a physical irq now does only that. Setting the trigger is a different action which has a different call. The main changes are: - I no longer call host->ops->map() for an already mapped irq, I just return the virtual number that was already mapped. It was called before to give an opportunity to change the trigger, but that was causing issues as that could happen while the interrupt was in use by a device, and because of the trigger change, map would potentially muck around with things in a racy way. That was causing much burden on a given's controller implementation of map() to get it right. This is much simpler now. map() is only called on the initial mapping of an irq, meaning that you know that this irq is _not_ being used. You can initialize the hardware if you want (though you don't have to). - Controllers that can handle different type of triggers (level/edge/etc...) now implement the standard irq_chip->set_type() call as defined by the generic code. That means that you can use the standard set_irq_type() to configure an irq line manually if you wish or (though I don't like that interface), pass explicit trigger flags to request_irq() as defined by the generic kernel interfaces. Also, using those interfaces guarantees that your controller set_type callback is called with the descriptor lock held, thus providing locking against activity on the same interrupt (including mask/unmask/etc...) automatically. A result is that, for example, MPIC's own map() implementation calls irq_set_type(NONE) to configure the hardware to the default triggers. - To allow the above, the irq_map array entry for the new mapped interrupt is now set before map() callback is called for the controller. - The irq_create_of_mapping() (also used by irq_of_parse_and_map()) function for mapping interrupts from the device-tree now also call the separate set_irq_type(), and only does so if there is a change in the trigger type. - While I was at it, I changed pci_read_irq_line() (which is the helper I would expect most archs to use in their pcibios_fixup() to get the PCI interrupt routing from the device tree) to also handle a fallback when the DT mapping fails consisting of reading the PCI_INTERRUPT_PIN to know wether the device has an interrupt at all, and the the PCI_INTERRUPT_LINE to get an interrupt number from the device. That number is then mapped using the default controller, and the trigger is set to level low. That default behaviour works for several platforms that don't have a proper interrupt tree like Pegasos. If it doesn't work for your platform, then either provide a proper interrupt tree from the firmware so that fallback isn't needed, or don't call pci_read_irq_line() - Add back a bit that got dropped by my main rework patch for properly clearing pending IPIs on pSeries when using a kexec Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50099328e4fe7c9f8981f408071a1ff82d59ddf8 tree 9597a3329541609117d4647451729bcd8ca9605d parent 3e5102ad70aaafe49823a02b368c0c3032c91439 author Johannes Berg Mon, 10 Jul 2006 04:44:41 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:20 -0700 [PATCH] aoa: tas: add missing bass/treble controls This patch adds the bass/treble controls to snd-aoa that snd-powermac always had for tas3004 based machines. Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e5102ad70aaafe49823a02b368c0c3032c91439 tree efe59d2afd1575f6ad1d5495d9839bb9ccd71ab3 parent 9b8f52f5b93e08f04b08e64e62d675bc43dd618e author Johannes Berg Mon, 10 Jul 2006 04:44:40 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:20 -0700 [PATCH] aoa: layout fabric: add missing module aliases The layout fabric gained support for all IDs when I extracted those from the OSX description file. But apparently I had forgotten to add them all as module aliases so the module will also load. This patch adds them. Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b8f52f5b93e08f04b08e64e62d675bc43dd618e tree fa027720f33d5c5ace2d4d915e53468a8b8b4699 parent 6a4f57874538fc05b99bd3bf7106f3df9b23a4ab author Johannes Berg Mon, 10 Jul 2006 04:44:39 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:19 -0700 [PATCH] aoa: tas: surface DRC control again This patch makes the DRC control visible again for TAS chips. Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a4f57874538fc05b99bd3bf7106f3df9b23a4ab tree 9731131b78823ba2f28a57c6d4f860e8c42e237f parent 14b42963f64b98ab61fa9723c03d71aa5ef4f862 author Benjamin Herrenschmidt Mon, 10 Jul 2006 04:44:39 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:19 -0700 [PATCH] aoa: tas: fix initialisation/reset This patch fixes the initialisation and reset of the tas codec. The tas will often reset if the i2s clocks go away so it needs to be completely re-initialised when clocks come back. Also, this patch adds some code for DRC that will be exploited later to add a DRC control again, fixing a regression over snd-powermac. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14b42963f64b98ab61fa9723c03d71aa5ef4f862 tree 8d21bb903a6acf2239e9e57e5abc4bceccc4a0ef parent a677c8fb8aa03e6ad9c206cb7284d294761ced2c author Johannes Berg Mon, 10 Jul 2006 04:44:38 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:19 -0700 [PATCH] aoa: tas: change PCM1 name to PCM This patch changes the PCM1 control name to PCM to make it play nice with the softvol plugin (which will then go away if it sees a proper PCM slider) Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a677c8fb8aa03e6ad9c206cb7284d294761ced2c tree b42b3be11de623314df203493bf945ae687cefea parent e53fcabc6d923e9c1cdd073ea2e2212daf907622 author Benjamin Herrenschmidt Mon, 10 Jul 2006 04:44:37 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:19 -0700 [PATCH] aoa fabric layout: clean up messages This patch cleans up the printk's in the layout fabric and also makes it display which type of GPIO access it is going to use. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e53fcabc6d923e9c1cdd073ea2e2212daf907622 tree 01b20c2ac97b293f83bb84ba6f8f27023b8523f7 parent 977c60238cfff1f9eb07cfd78bc02da91b7b499b author Benjamin Herrenschmidt Mon, 10 Jul 2006 04:44:37 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:19 -0700 [PATCH] aoa: pmf gpio: report if function calling fails This patch makes the pmf GPIO layer in aoa report if calling a platform function failed. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 977c60238cfff1f9eb07cfd78bc02da91b7b499b tree e44a3e190aa857d1d843366ead8929fd0fe163a6 parent a08bc4cb09dfea4cb1d29061d82b04338ed7c21a author Benjamin Herrenschmidt Mon, 10 Jul 2006 04:44:36 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:19 -0700 [PATCH] aoa: i2sbus: revamp control layer This patch revamps the i2sbus control layer by using the macio/keylargo functions instead of directly mapping. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a08bc4cb09dfea4cb1d29061d82b04338ed7c21a tree 3cb4020c56518f44597c536b26f1fdce7272d9d6 parent 389ba79582b9bc2463b44ad60df62d709ebcdf97 author Benjamin Herrenschmidt Mon, 10 Jul 2006 04:44:35 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:19 -0700 [PATCH] aoa: fix when all is built into the kernel This patch fixes initialisation issues when all of aoa is built into the kernel by re-ordering the link order in the Makefile and making the soundbus use subsys_initcall so it is initialised earlier. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 389ba79582b9bc2463b44ad60df62d709ebcdf97 tree 12a6c2d7ed1a80306c116237d5070dbe64d3a32a parent f9d08de57b0beb6623a89d8a8f501040c5eadacb author Benjamin Herrenschmidt Mon, 10 Jul 2006 04:44:34 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:19 -0700 [PATCH] aoa: i2sbus: fix for PowerMac7,2 and 7,3 This patch cleans up the resource handling in i2sbus and adds workarounds for the broken device trees on the PowerMac7,2 and 7,3. Some of this code will later move again when macio_asic is going to export all the sub-nodes too. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9d08de57b0beb6623a89d8a8f501040c5eadacb tree 81ae2c1178877e35508d3b01c5734042f90f0d8f parent 4a14cf4508a77d03436f34a1f6a9bc3eee12fc08 author Benjamin Herrenschmidt Mon, 10 Jul 2006 04:44:34 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:18 -0700 [PATCH] aoa: i2sbus: move module parameter declaration up This patch moves the i2sbus 'force' module parameter declaration to the top of the file. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a14cf4508a77d03436f34a1f6a9bc3eee12fc08 tree aa32c71ddc55d07cded59d5a6d45e588201f72d3 parent e154ff3d2c5ad313ef0c66e6217502361cad2799 author Andreas Schwab Mon, 10 Jul 2006 04:44:33 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:18 -0700 [PATCH] Fix snd-aoa irq conversion Use proper irq mapping interface for snd-aoa-i2sbus. Signed-off-by: Andreas Schwab Acked-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e154ff3d2c5ad313ef0c66e6217502361cad2799 tree 699be5e589775061d4279a7439ba5b2dc517078b parent 32dd66fce3b0ad5857433433b795844cb397608e author Roman Zippel Mon, 10 Jul 2006 04:44:32 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:18 -0700 [PATCH] adjust clock for lost ticks A large number of lost ticks can cause an overadjustment of the clock. To compensate for this we look at the current error and the larger the error already is the more careful we are at adjusting the error. As small extra fix reset the error when the clock is set. Signed-off-by: Roman Zippel Acked-by: john stultz Cc: Uwe Bugla Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32dd66fce3b0ad5857433433b795844cb397608e tree b8e1aae3b9fdbec7540e3652a102de8029434c28 parent 7f4599e9cd6bca0efc1000359584d1cff68f9f13 author Heiko Carstens Mon, 10 Jul 2006 04:44:31 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:18 -0700 [PATCH] vmstat: export all_vm_events() Add missing EXPORT_SYMBOL for all_vm_events(). Git commit f8891e5e1f93a128c3900f82035e8541357896a7 caused this: Building modules, stage 2. MODPOST WARNING: "all_vm_events" [arch/s390/appldata/appldata_mem.ko] undefined! CC arch/s390/appldata/appldata_mem.mod.o Cc: Christoph Lameter Cc: Gerald Schaefer Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f4599e9cd6bca0efc1000359584d1cff68f9f13 tree 63a02f7d0574d8bab3ec96657ae30985fcbb88e3 parent 06a9ec291b3aec9c7e36af0a10ad2b556bd7e84f author Christoph Lameter Mon, 10 Jul 2006 04:44:30 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:18 -0700 [PATCH] ZVC: add __inc_zone_state for !SMP configuration It turns out that there is a way to build a kernel with NUMA and no SMP. In that case we are missing one definition __inc_zone_state. Provide that missing __inc_zone_state. (akpm: NUMA && !SMP sounds odd, but I am told "But there is the concept of cpuless nodes. A NUMA system without SMP has a single processor but multiple memory nodes. This used to work before on IA64 (wasn't aware of it, never seen anyone with this kind of thing).") Acked-by: Tony Luck Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06a9ec291b3aec9c7e36af0a10ad2b556bd7e84f tree a98c1293470967bfa93e250b99b6a0ff129e3dee parent bed936f7eab946c60170bc92a1aea597da158e02 author Thomas Gleixner Mon, 10 Jul 2006 04:44:30 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:18 -0700 [PATCH] pi-futex: Validate futex type instead of oopsing Calling futex_lock_pi is called with a reference to a non PI futex and waiters exist already, lookup_pi_state() oopses due to pi_state == NULL. Check this condition and return -EINVAL to userspace. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: Jakub Jelinek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bed936f7eab946c60170bc92a1aea597da158e02 tree 746083d8c8172dc240d4d50c91a563c1aa05944e parent 868e81b8ada8fa05bdc08b5e6fa73307caaeab6d author Konstantin Karasyov Mon, 10 Jul 2006 04:44:26 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:18 -0700 [PATCH] ACPI: fix fan/thermal resume Daniel Ritz says: The acpi driver suspend/resume patches that went in recently caused a regression on my box (toshiba tecra 8000 laptop): after resume from swsusp the fan turns on keeping blowing cold air out of my notebook. before the patches, the fan was off and would only make noise when required. it's the same thing described in bugzilla.kernel.org #5000. the acpi suspend/resume patches or at least parts of them originate in this bug. now the last patch in the report (attach id 8438) actually fixes the problem - for me and the reporter. this is a trimmed down version of that patch. Signed-off-by: Daniel Ritz Cc: Len Brown Cc: Sanjoy Mahajan Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 868e81b8ada8fa05bdc08b5e6fa73307caaeab6d tree a516325a6e5cb655af6e216dcec80f556cc552c4 parent 80d6679a62fe45f440d042099d997a42e4e8c59d author Yoshinori Sato Mon, 10 Jul 2006 04:44:24 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:18 -0700 [PATCH] h8300 remove duplicate define Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80d6679a62fe45f440d042099d997a42e4e8c59d tree 64029c46a0607879567bbb2eb38fc22fa500ca2a parent 69c3a5b8fd8cfa67be22f6d7ae5c681c6777d817 author Adrian Bunk Mon, 10 Jul 2006 04:44:24 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:18 -0700 [PATCH] kernel/softirq.c: EXPORT_UNUSED_SYMBOL This patch marks an unused export as EXPORT_UNUSED_SYMBOL. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69c3a5b8fd8cfa67be22f6d7ae5c681c6777d817 tree e98b9e824ea4401b755f95cd4828e9cadce84de1 parent b0d85c5c3009d292fe195f666cbbec7da47dabf4 author Adrian Bunk Mon, 10 Jul 2006 04:44:23 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:18 -0700 [PATCH] fs/read_write.c: EXPORT_UNUSED_SYMBOL This patch marks an unused export as EXPORT_UNUSED_SYMBOL. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0d85c5c3009d292fe195f666cbbec7da47dabf4 tree ca1e7158f37b8335e32568cf78dc552b2b6f29a5 parent 26fc52367af3774b123334bca409159ce37d2857 author Adrian Bunk Mon, 10 Jul 2006 04:44:23 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:17 -0700 [PATCH] mm/mmzone.c: EXPORT_UNUSED_SYMBOL This patch marks three unused exports as EXPORT_UNUSED_SYMBOL. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26fc52367af3774b123334bca409159ce37d2857 tree 6b3ecdc0a1bfa6691eebe76c3724d716c6580047 parent 6d46cc6b9b04dc28a9c5db62db791aeec8ab2ea5 author Adrian Bunk Mon, 10 Jul 2006 04:44:22 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:17 -0700 [PATCH] mm/memory.c: EXPORT_UNUSED_SYMBOL This patch marks an unused export as EXPORT_UNUSED_SYMBOL. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d46cc6b9b04dc28a9c5db62db791aeec8ab2ea5 tree 2d37b0b9177280e28aaf26cd5db877274da7d7f0 parent c0fc84d2e5bb4a9e3ae470812a00cccba85a48b8 author Adrian Bunk Mon, 10 Jul 2006 04:44:21 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:17 -0700 [PATCH] mm/bootmem.c: EXPORT_UNUSED_SYMBOL This patch marks an unused export as EXPORT_UNUSED_SYMBOL. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0fc84d2e5bb4a9e3ae470812a00cccba85a48b8 tree 17adcafbb353a525ac16c86b976b1f499b40ee6c parent d0a0a5ee7a0094231a11cfe3f86d2d8f5f994e01 author Adrian Bunk Mon, 10 Jul 2006 04:44:21 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:17 -0700 [PATCH] kernel/printk.c: EXPORT_SYMBOL_UNUSED This patch marks unused exports as EXPORT_SYMBOL_UNUSED. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0a0a5ee7a0094231a11cfe3f86d2d8f5f994e01 tree a6118e5bf43a4e60d9e555e74bac31e764e17aef parent d69504325978c461b51b03cca49626026970307b author Andrew Morton Mon, 10 Jul 2006 04:44:20 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:17 -0700 [PATCH] md: fix oops in error-handling During early MD setup (superblock reading), we don't have a personality yet. But the error-handling code tries to dereference mddev->pers. Fix. Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d69504325978c461b51b03cca49626026970307b tree 73ea1d68d5d3cca777cb6ea9828c5757b4cd6df8 parent 67463acb646904d76a8e237cc31eaa87872f30cc author NeilBrown Mon, 10 Jul 2006 04:44:20 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:17 -0700 [PATCH] md: include sector number in messages about corrected read errors This is generally useful, but particularly helps see if it is the same sector that always needs correcting, or different ones. [akpm@osdl.org: fix printk warnings] Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67463acb646904d76a8e237cc31eaa87872f30cc tree 4ccf373165581ed898328ca03365abfdd7d23a04 parent 80ca3a44f563a763fa872390dcb393f2d82027bf author NeilBrown Mon, 10 Jul 2006 04:44:19 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:17 -0700 [PATCH] md: require CAP_SYS_ADMIN for (re-)configuring md devices via sysfs The ioctl requires CAP_SYS_ADMIN, so sysfs should too. Note that we don't require CAP_SYS_ADMIN for reading attributes even though the ioctl does. There is no reason to limit the read access, and much of the information is already available via /proc/mdstat Cc: Chris Wright Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80ca3a44f563a763fa872390dcb393f2d82027bf tree f11e4756575cf2d85ae4d3bba17634eaa933a475 parent 5e3db645f890660ce8774a18bcd418570298937e author NeilBrown Mon, 10 Jul 2006 04:44:18 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:17 -0700 [PATCH] md: unify usage of symbolic names for perms Some places we use number (0660) someplaces names (S_IRUGO). Change all numbers to be names, and change 0655 to be what it should be. Also make some formatting more consistent. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e3db645f890660ce8774a18bcd418570298937e tree a6664a8c864e40c69c7be4da6e1ff984f11873c5 parent ae3c20ccf84c88d45616f12122f781a900118f09 author NeilBrown Mon, 10 Jul 2006 04:44:18 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:17 -0700 [PATCH] md: fix usage of wrong variable in raid1 Though it rarely matters, we should be using 's' rather than r1_bio->sector here. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae3c20ccf84c88d45616f12122f781a900118f09 tree 19d2f11d8a4766182402316632d32bd66d518c55 parent 7c785b7a18dc30572a49c6b75efd384269735d14 author NeilBrown Mon, 10 Jul 2006 04:44:17 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:17 -0700 [PATCH] md: fix some small races in bitmap plugging in raid5 The comment gives more details, but I didn't quite have the sequencing write, so there was room for races to leave bits unset in the on-disk bitmap for short periods of time. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c785b7a18dc30572a49c6b75efd384269735d14 tree de115f4692b1be55ae3ad93a2719edc5b5688a37 parent ff4e8d9a9f46e3a7f89d14ade52fe5d53a82c022 author NeilBrown Mon, 10 Jul 2006 04:44:16 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:16 -0700 [PATCH] md: fix a plug/unplug race in raid5 When a device is unplugged, requests are moved from one or two (depending on whether a bitmap is in use) queues to the main request queue. So whenever requests are put on either of those queues, we should make sure the raid5 array is 'plugged'. However we don't. We currently plug the raid5 queue just before putting requests on queues, so there is room for a race. If something unplugs the queue at just the wrong time, requests will be left on the queue and nothing will want to unplug them. Normally something else will plug and unplug the queue fairly soon, but there is a risk that nothing will. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff4e8d9a9f46e3a7f89d14ade52fe5d53a82c022 tree e15fc4d8af0045a3947e3a25844773c6ee50289a parent 0b8c9de05c2a860fe6b02fedcb48763bcee648b3 author NeilBrown Mon, 10 Jul 2006 04:44:16 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:16 -0700 [PATCH] md: fix resync speed calculation for restarted resyncs We introduced 'io_sectors' recently so we could count the sectors that causes io during resync separate from sectors which didn't cause IO - there can be a difference if a bitmap is being used to accelerate resync. However when a speed is reported, we find the number of sectors processed recently by subtracting an oldish io_sectors count from a current 'curr_resync' count. This is wrong because curr_resync counts all sectors, not just io sectors. So, add a field to mddev to store the curren io_sectors separately from curr_resync, and use that in the calculations. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b8c9de05c2a860fe6b02fedcb48763bcee648b3 tree 893228041dfcc44a216a6887e75c2424e0a8bca9 parent 31b65a0d3894566191b91fbadd122c354a363b5d author NeilBrown Mon, 10 Jul 2006 04:44:15 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:16 -0700 [PATCH] md: delay starting md threads until array is completely setup When an array is started we start one or two threads (two if there is a reshape or recovery that needs to be completed). We currently start these *before* the array is completely set up and in particular before queue->queuedata is set. If the thread actually starts very quickly on another CPU, we can end up dereferencing queue->queuedata and oops. This patch also makes sure we don't try to start a recovery if a reshape is being restarted. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31b65a0d3894566191b91fbadd122c354a363b5d tree 42836c0798c1a85d7bf1551a22293476cb70601e parent f4370781d83cd2e52eb515e4663155e8091e4d4e author NeilBrown Mon, 10 Jul 2006 04:44:14 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:16 -0700 [PATCH] md: set desc_nr correctly for version-1 superblocks This has to be done in ->load_super, not ->validate_super Without this, hot-adding devices to an array doesn't always work right - though there is a work around in mdadm-2.5.2 to make this less of an issue. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4370781d83cd2e52eb515e4663155e8091e4d4e tree bb10a0abec68746204cac32dc4839c1b41df3d41 parent 894673ee6122a3ce1958e1fe096901ba5356a96b author NeilBrown Mon, 10 Jul 2006 04:44:14 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:16 -0700 [PATCH] md: possible fix for unplug problem I have reports of a problem with raid5 which turns out to be because the raid5 device gets stuck in a 'plugged' state. This shouldn't be able to happen as 3msec after it gets plugged it should get unplugged. However it happens none-the-less. This patch fixes the problem and is a reasonable thing to do, though it might hurt performance slightly in some cases. Until I can find the real problem, we should probably have this workaround in place. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 894673ee6122a3ce1958e1fe096901ba5356a96b tree 2fe842e63046ead098c5c61c0938ad8128934412 parent a8f340e394ff30b79ab5b03c67ab4c94b2ac3646 author Jon Smirl Mon, 10 Jul 2006 04:44:13 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:16 -0700 [PATCH] tty: Remove include of screen_info.h from tty.h screen_info.h doesn't have anything to do with the tty layer and shouldn't be included by tty.h. This patches removes the include and modifies all users to directly include screen_info.h. struct screen_info is mainly used to communicate with the console drivers in drivers/video/console. Note that this patch touches every arch and I have no way of testing it. If there is a mistake the worst thing that will happen is a compile error. [akpm@osdl.org: fix arm build] [akpm@osdl.org: fix alpha build] Signed-off-by: Jon Smirl Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8f340e394ff30b79ab5b03c67ab4c94b2ac3646 tree 54bb79dba4f3943e893bacd1efe7b265d7f86aaa parent 67eb5db5874076db01febed5a1a9281628fa9fb4 author Jon Smirl Mon, 10 Jul 2006 04:44:12 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:16 -0700 [PATCH] vt: Remove VT-specific declarations and definitions from tty.h MAX_NR_CONSOLES, fg_console, want_console and last_console are more of a function of the VT layer than the TTY one. Moving these to vt.h and vt_kern.h allows all of the framebuffer and VT console drivers to remove their dependency on tty.h. [akpm@osdl.org: fix alpha build] Signed-off-by: Jon Smirl Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67eb5db5874076db01febed5a1a9281628fa9fb4 tree 5116e91370d700c5eb497f13a24f10203baf5caa parent acbf8bd738f1357e0e3b97b918bef5be272b176e author Karsten Keil Mon, 10 Jul 2006 04:44:11 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:15 -0700 [PATCH] hisax: fix usage of __init* Fix the warnings about the section mismatches for __init* in the HiSax driver. Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acbf8bd738f1357e0e3b97b918bef5be272b176e tree beda8d39618b346f2fa1f4b017f9288f191ecb2c parent 73ca66b97b73257a7d832d502c36fc19fe847809 author Luiz Fernando N. Capitulino Mon, 10 Jul 2006 04:44:11 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:15 -0700 [PATCH] Updates CREDITS file Updates my personal entry in the CREDITS file. Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73ca66b97b73257a7d832d502c36fc19fe847809 tree d39f50b1931d67c51e56f891b785be1143599177 parent 454d6fbc48374be8f53b9bafaa86530cf8eb3bc1 author Magnus Damm Mon, 10 Jul 2006 04:44:09 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:15 -0700 [PATCH] release_firmware() fixes Use release_firmware() to free requested resources. According to Documentation/firmware_class/README the request_firmware() call should be followed by a release_firmware(). Some drivers do not however free the firmware previously allocated with request_firmware(). This patch tries to fix this by making sure that release_firmware() is used as expected. Signed-off-by: Magnus Damm Acked-by: Marcel Holtmann Cc: Mauro Carvalho Chehab Cc: "John W. Linville" Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 454d6fbc48374be8f53b9bafaa86530cf8eb3bc1 tree 4c03136b93d2b7626df68c9ee7af2c9fc064f765 parent 5d8b2ebfa298ec4e6d9fa43e60fb013e8cd963aa author Jens Axboe Mon, 10 Jul 2006 04:44:08 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:15 -0700 [PATCH] cdrom: fix bad cgc.buflen assignment The code really means to mask off the high bits, not assign 0xff. Signed-off-by: Jens Axboe Cc: Marcus Meissner Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d8b2ebfa298ec4e6d9fa43e60fb013e8cd963aa tree 0ed5349de7d6d667390d0a8b0136812b4eec63ba parent 82a854ec4f46c5fbef11b06bb49078ecc5784a2d author Jonathan Corbet Mon, 10 Jul 2006 04:44:07 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:15 -0700 [PATCH] VFS documentation tweak As I was looking over the get_sb() changes, I stumbled across a little mistake in the documentation updates. Unless we're getting into an interesting new object-oriented realm, I doubt that get_sb() should really return "struct int"... Signed-off-by: Jonathan Corbet Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82a854ec4f46c5fbef11b06bb49078ecc5784a2d tree c0a04ec612047065d94d1372871eecdb6401d287 parent 1454aed92b6b89cb1fbe3cbecd8ceaa7a122f3b7 author Urs Thuermann Mon, 10 Jul 2006 04:44:06 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:15 -0700 [PATCH] RCU Documentation fix Updater should use _rcu variant of list_del(). Signed-off-by: Urs Thuermann Acked-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1454aed92b6b89cb1fbe3cbecd8ceaa7a122f3b7 tree fc8ff55a38bed2400aa21ee75e8311e9064060cd parent f86bf9b7bcc5d325687a8b80da8ee3eb56e02da7 author Arjan van de Ven Mon, 10 Jul 2006 04:44:05 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:15 -0700 [PATCH] put a comment at register_die_notifier that the export is used {un}register_die_notifier() is used by kdb... document this so that future "remove dead export" rounds can skip this export. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f86bf9b7bcc5d325687a8b80da8ee3eb56e02da7 tree 393bf9df55fae3932099fa789d110833c7064ef3 parent d6d897cec29252b8d0785198cfa6ca16d30c739d author Ingo Molnar Mon, 10 Jul 2006 04:44:05 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:14 -0700 [PATCH] lockdep: clean up completion initializer in smpboot.c Clean up lockdep on-stack-completion initializer. (This also removes the dependency on waitqueue_lock_key.) Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6d897cec29252b8d0785198cfa6ca16d30c739d tree 01b138b10c7afa0e88e9720be3d3616e4f0bccc1 parent 55794a412fdf9af1744800e5020a4ec6b21e3cdc author Ingo Molnar Mon, 10 Jul 2006 04:44:04 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:14 -0700 [PATCH] lockdep: core, reduce per-lock class-cache size lockdep_map is embedded into every lock, which blows up data structure sizes all around the kernel. Reduce the class-cache to be for the default class only - that is used in 99.9% of the cases and even if we dont have a class cached, the lookup in the class-hash is lockless. This change reduces the per-lock dep_map overhead by 56 bytes on 64-bit platforms and by 28 bytes on 32-bit platforms. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55794a412fdf9af1744800e5020a4ec6b21e3cdc tree 3429cb26c5dfd484487b15827c655b5d080ce0f8 parent 5fca80e8b4bf5d69b900115b14342133ce81d79e author Arjan van de Ven Mon, 10 Jul 2006 04:44:03 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:14 -0700 [PATCH] lockdep: improve debug output Make lockdep print which lock is held, in the "kfree() of a live lock" scenario. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fca80e8b4bf5d69b900115b14342133ce81d79e tree 0dfa5b922438edf36ff9da2ff8a03e0d8f89c29f parent f9829cceb686f3719215fe43c8593e5f3efe1710 author Ingo Molnar Mon, 10 Jul 2006 04:44:02 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:14 -0700 [PATCH] lockdep: add more rwsem.h documentation Add more documentation to rwsem.h. Signed-off-by: Ingo Molnar Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9829cceb686f3719215fe43c8593e5f3efe1710 tree eb6f721915c879646f81e423b6606d6b4376bed9 parent 8f72e4028a1ff968000cec4a034f45619fbd7ec4 author Andi Kleen Mon, 10 Jul 2006 04:44:01 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:14 -0700 [PATCH] Minor cleanup to lockdep.c - Use printk formatting for indentation - Don't leave NTFS in the default event filter Signed-off-by: Andi Kleen Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f72e4028a1ff968000cec4a034f45619fbd7ec4 tree d89a2a02d9ed8b0371edba6fd7ac3873441a76b3 parent 25e206b54b9a20e63b6f5194aeebfa13d37e015c author Andrew Morton Mon, 10 Jul 2006 04:44:01 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:14 -0700 [PATCH] fadvise: remove dead comments Cc: "Michael Kerrisk" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25e206b54b9a20e63b6f5194aeebfa13d37e015c tree 3b93a095eb1237e8d74f52553b69b666e6044f7d parent 7691030bc9732f7d535522dda78cfdd36716def1 author Peter Oberparleiter Mon, 10 Jul 2006 04:44:00 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:14 -0700 [PATCH] partitions: let partitions inherit policy from disk Change the partition code in fs/partitions/check.c to initialize a newly detected partition's policy field with that of the containing block device (see patch below). My reasoning is that function set_disk_ro() in block/genhd.c modifies the policy field (read-only indicator) of a disk and all contained partitions. When a partition is detected after the call to set_disk_ro(), the policy field of this partition will currently not inherit the disk's policy field. This behavior poses a problem in cases where a block device can be 'logically de- and reactivated' like e.g. the s390 DASD driver because partition detection may run after the policy field has been modified. Signed-off-by: Peter Oberparleiter Acked-by: Al Viro Makes-sense-to: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7691030bc9732f7d535522dda78cfdd36716def1 tree 9d6379f09bc50dd7c806fce5b544e32249575914 parent eb0e71c7f388bfcb3f74897f23d0cf09310fc05b author Chuck Short Mon, 10 Jul 2006 04:43:59 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:13 -0700 [PATCH] Add Specialix IO8+ card support hotplug support Patch Description: Add "Specialix IO8+ card support" hotplug support patch location: http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=d795cfc591bb44f6b3d86d8f054a227cecb44bb4 [akpm@osdl.org: cleanup] Cc: Randy Dunlap Signed-off-by: Chuck Short Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb0e71c7f388bfcb3f74897f23d0cf09310fc05b tree 62c7c3ac73e5f8b7378c5792490a70ecd407d706 parent 64552a50bc80fecb73617336bf197375868faf6e author Chuck Short Mon, 10 Jul 2006 04:43:59 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:13 -0700 [PATCH] Add Computone IntelliPort Plus serial hotplug support Patch Description: Add "Computone IntelliPort Plus serial" hotplug support patch location: http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=8c36723187c0fa5efe0e5c6a9b1e66ed4b824792 [akpm@osdl.org: cleanup] Cc: Randy Dunlap Signed-off-by: Chuck Short Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64552a50bc80fecb73617336bf197375868faf6e tree 767b65ce1b4cd757f95b4048376d6f63fad68b8c parent 73ce5934e2d855db436566297f12966eb507a435 author Horms Mon, 10 Jul 2006 04:43:58 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:13 -0700 [PATCH] nfs: Update Documentation/nfsroot.txt to include dhcp, syslinux and isolinux * Document the ip command a little differently to make the interaction between defaults and autoconfiguration a little clearer (I hope) * Update autoconfiguration the current set of options, including DHCP * Update the boot methods to add syslinux and isolinux, and remove dd of=/dev/fd0 which is no longer supported by linux * Add a referance to initramfs along side initrd. Should the latter and its document be removed some time soon? * Various cleanups to put the text consistently into the thrid person * Reformated a bit to fit into 80 columns a bit more nicely * Should the bootloaders documentation be removed or split into a separate documentation, it seems somewhat out of scope Signed-off-by: Horms Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73ce5934e2d855db436566297f12966eb507a435 tree 8e3e2fa1690dbd2f5a389ea5c5b151287f9e0297 parent 0808925ea5684a0ce25483b30e94d4f398804978 author Hisashi Hifumi Mon, 10 Jul 2006 04:43:56 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:13 -0700 [PATCH] reiserfs: fix journaling issue regarding fsync() When write() extends a file(i_size is increased) and fsync() is called, change of inode must be written to journaling area through fsync(). But,currently the i_trans_id is not correctly updated when i_size is increased. So fsync() does not kick the journal writer. Reiserfs_file_write() already updates the transaction when blocks are allocated, but the case when i_size increases and new blocks are not added is not correctly treated. Following patch fix this bug. Signed-off-by: Hisashi Hifumi Cc: Jeff Mahoney Cc: Chris Mason Cc: Hans Reiser Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0808925ea5684a0ce25483b30e94d4f398804978 tree 62456726442d656d21bc4fa6b1339f0236f0a6e8 parent c312feb2931ded0582378712727b7ea017a951bd author Eric Paris Mon, 10 Jul 2006 04:43:55 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:13 -0700 [PATCH] SELinux: add rootcontext= option to label root inode when mounting Introduce a new rootcontext= option to FS mounting. This option will allow you to explicitly label the root inode of an FS being mounted before that FS or inode because visible to userspace. This was found to be useful for things like stateless linux, see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=190001 Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c312feb2931ded0582378712727b7ea017a951bd tree dd985aa4dd0b759690af9557a5170dabf589d87f parent 2ed6e34f88a0d896a6f889b00693cae0fadacfd0 author Eric Paris Mon, 10 Jul 2006 04:43:53 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:13 -0700 [PATCH] SELinux: decouple fscontext/context mount options Remove the conflict between fscontext and context mount options. If context= is specified without fscontext it will operate just as before, if both are specified we will use mount point labeling and all inodes will get the label specified by context=. The superblock will be labeled with the label of fscontext=, thus affecting operations which check the superblock security context, such as associate permissions. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ed6e34f88a0d896a6f889b00693cae0fadacfd0 tree 1f1d488c62fe577fca19fea9bec3f8567faf7a10 parent 0a565f7919cfb3d3df2c97d45751cbb83d858f97 author Andreas Mohr Mon, 10 Jul 2006 04:43:52 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:13 -0700 [PATCH] small kernel/sched.c cleanup - constify and optimize stat_nam (thanks to Michael Tokarev!) - spelling and comment fixes Signed-off-by: Andreas Mohr Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a565f7919cfb3d3df2c97d45751cbb83d858f97 tree cc1294f43b1e14dbc5a69a9624b69a48eec78bd1 parent e45b3b6af09dab2a28a7c88b340d0bcdd173e068 author Peter Williams Mon, 10 Jul 2006 04:43:51 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:13 -0700 [PATCH] sched: fix bug in __migrate_task() Problem: In the function __migrate_task(), deactivate_task() followed by activate_task() is used to move the task from one run queue to another. This has two undesirable effects: 1. The task's priority is recalculated. (Nowhere else in the scheduler code is the priority recalculated for a change of CPU.) 2. The task's time stamp is set to the current time. At the very least, this makes the adjustment of the time stamp before the call to deactivate_task() redundant but I believe the problem is more serious as the time stamp now holds the time of the queue change instead of the time at which the task was woken. In addition, unless dest_rq is the same queue as "current" is on the time stamp could be inaccurate due to inter CPU drift. Solution: Replace the call to activate_task() with one to __activate_task(). Signed-off-by: Peter Williams Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e45b3b6af09dab2a28a7c88b340d0bcdd173e068 tree 54fe9104271396ceb02985be631debc55b18013a parent 1a91023a9f172f820e292f2c5675fb9f8e2636f0 author Andrew Morton Mon, 10 Jul 2006 04:43:50 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:13 -0700 [PATCH] count_vm_events() fix Dopey bug. Causes hopelessly-wrong numbers from vmstat(8) and several other counters. Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a91023a9f172f820e292f2c5675fb9f8e2636f0 tree 18e72fcdc6e961e82e95ffc332cc2bd97ce9e4bc parent 135c294fa3660b979d71bbce1611f9ca721077b5 author Andrew Morton Mon, 10 Jul 2006 04:43:49 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:13 -0700 [PATCH] x86_64: e820.c needs pgtable.h arch/x86_64/kernel/e820.c:42: error: 'MAXMEM' undeclared here (not in a function) Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 135c294fa3660b979d71bbce1611f9ca721077b5 tree cdc0bf385c961493e54c3c1c539efe23d15de68d parent b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d author Andrew Morton Mon, 10 Jul 2006 04:43:48 -0700 committer Linus Torvalds Mon, 10 Jul 2006 13:24:12 -0700 [PATCH] don't select CONFIG_HOTPLUG It's useful to be able to turn off CONFIG_HOTPLUG for compile-coverage testing and for section-checking coverage. But a few things go and select CONFIG_HOTPLUG, making it a royal PITA to turn the thing off. It's only turnable offable if CONFIG_EMBEDDED anyway. So let's make those things depend on HOTPLUG, not select it. Cc: Greg KH Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0466684907ea1695eeef98cb28ca3399882ecc0a tree ab60641f77d064c28ee508fe64b8d9515985ad2f parent c0dc250e89cb8af77c5689b36eda851158e8573e parent 07a18684c92c0156f87ea158b5adc3022485f82a author Len Brown Mon, 10 Jul 2006 14:20:17 -0400 committer Len Brown Mon, 10 Jul 2006 14:20:17 -0400 Pull dock into release branch commit 07a18684c92c0156f87ea158b5adc3022485f82a tree a2dd08d7ff40a82d7cf6d4cd461123a3eca63dd6 parent 8d7bff6c0896feba2fbd5ce37062c212aee13870 author Kristen Accardi Mon, 10 Jul 2006 14:19:15 -0400 committer Len Brown Mon, 10 Jul 2006 14:19:15 -0400 ACPI: ACPI_DOCK: Initialize the atomic notifier list Signed-off-by: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit c0dc250e89cb8af77c5689b36eda851158e8573e tree 41c11fb811b31ee28bd20befdc685384f96db1fc parent 0f12b15ebcedce115a5d8e5ff741e49a7993f67c parent e21c1ca3f98529921c829a792dfdbfc5a5dc393b author Len Brown Mon, 10 Jul 2006 02:39:47 -0400 committer Len Brown Mon, 10 Jul 2006 02:39:47 -0400 Pull acpi_os_allocate into test branch commit 0f12b15ebcedce115a5d8e5ff741e49a7993f67c tree 3bfea88873b2a43c5528b9687fa010b6eff23458 parent 20b499aa06edf59fa2d21f29d42d36586c6c058e parent f6dd9221dddb3550e60d32aee688588ec208312c author Len Brown Mon, 10 Jul 2006 02:39:41 -0400 committer Len Brown Mon, 10 Jul 2006 02:39:41 -0400 Pull acpica-20060707 into test branch commit 20b499aa06edf59fa2d21f29d42d36586c6c058e tree 2691a1de8f285fcc9a65fa65bd2ece4d4ec8404f parent dece75b3a288fa49b3aab685543ec2f5c94b8cfc parent ab8aa06a5c0b75974fb1949365cbb20a15cedf14 author Len Brown Mon, 10 Jul 2006 02:39:36 -0400 committer Len Brown Mon, 10 Jul 2006 02:39:36 -0400 Pull bugzilla-6687 into test branch commit dece75b3a288fa49b3aab685543ec2f5c94b8cfc tree 42b4871522182106d06061923fe9e567ac2e10db parent 1a39ed5888a8336ed2762d5b367195b14b878850 parent 8d7bff6c0896feba2fbd5ce37062c212aee13870 author Len Brown Mon, 10 Jul 2006 02:39:33 -0400 committer Len Brown Mon, 10 Jul 2006 02:39:33 -0400 Pull dock into test branch commit 1a39ed5888a8336ed2762d5b367195b14b878850 tree 97119752e85b6ab063e5c1bab42d931eee44f311 parent 1b045e5d207fc65e6708e303c2ab4249bf619982 parent d75080328affb4b268da430b7074cc8139cc662a author Len Brown Mon, 10 Jul 2006 02:39:26 -0400 committer Len Brown Mon, 10 Jul 2006 02:39:26 -0400 Pull trivial into test branch commit 1b045e5d207fc65e6708e303c2ab4249bf619982 tree 75e8db9acf0f9e5df4bf8b88b1731739d9f1faf0 parent b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d parent 8970bfe706345223d39d33bfce5f8b29750ab716 author Len Brown Mon, 10 Jul 2006 02:39:23 -0400 committer Len Brown Mon, 10 Jul 2006 02:39:23 -0400 Pull battery into test branch commit e21c1ca3f98529921c829a792dfdbfc5a5dc393b tree fdb0a3c00d46db197ae65e6c66fc841b194cb507 parent b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d author Len Brown Mon, 10 Jul 2006 01:35:51 -0400 committer Len Brown Mon, 10 Jul 2006 02:37:22 -0400 ACPI: acpi_os_allocate() fixes Replace acpi_in_resume with a more general hack to check irqs_disabled() on any kmalloc() from ACPI. While setting (system_state != SYSTEM_RUNNING) on resume seemed more general, Andrew Morton preferred this approach. http://bugzilla.kernel.org/show_bug.cgi?id=3469 Make acpi_os_allocate() into an inline function to allow /proc/slab_allocators to work. Delete some memset() that could fault on allocation failure. Signed-off-by: Len Brown commit 8970bfe706345223d39d33bfce5f8b29750ab716 tree 0a1df121ce05018858e8a52df51281b8adae3c1c parent 953969ddf5b049361ed1e8471cc43dc4134d2a6f author Andrew Morton Mon, 10 Jul 2006 02:34:45 -0400 committer Len Brown Mon, 10 Jul 2006 02:34:45 -0400 ACPI: SBS: fix initialization, sem2mutex cm_sbs_sem is being downed (via acpi_ac_init->acpi_lock_ac_dir) before it is initialised, with grave results. - Make it a mutex - Initialise it - Make it static - Clean other stuff up. Thanks to Paul Drynoff for reporting and testing. Cc: Rich Townsend Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit d75080328affb4b268da430b7074cc8139cc662a tree ea743887a7a2e0fd6c859d7bacbc274299f958f5 parent e26a2b8f68dca28c734d857517788e3b40b8691d author Arjan van de Ven Tue, 04 Jul 2006 13:06:00 -0400 committer Len Brown Mon, 10 Jul 2006 00:04:29 -0400 ACPI: add 'const' to several ACPI file_operations Signed-off-by: Arjan van de Ven Signed-off-by: Len Brown commit e26a2b8f68dca28c734d857517788e3b40b8691d tree a256259dcbdced5c2a3c23bd235f380c9ed464db parent af4f949c6b4ffa5119aad980626e5b04daca961b author Andi Kleen Thu, 06 Jul 2006 12:14:00 -0400 committer Len Brown Sun, 09 Jul 2006 23:38:54 -0400 ACPI: delete some defaults from ACPI Kconfig No need for video to be always in No need for ACPI dock driver to be always in No need for smart battery driver to be always in Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit af4f949c6b4ffa5119aad980626e5b04daca961b tree 4cc9dcce0582c5ab5551777f8fad671d79a553c7 parent b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d author Len Brown Sun, 09 Jul 2006 16:33:26 -0400 committer Len Brown Sun, 09 Jul 2006 23:30:00 -0400 ACPI: "Device `[%s]' is not power manageable" make message debug only Signed-off-by: Len Brown commit 8d7bff6c0896feba2fbd5ce37062c212aee13870 tree 2bfde8445b61cc573c12c44b074ed9bc79e100dd parent c8f7a62cdde461914c6457d5f4362538ed810bf4 author Len Brown Sun, 09 Jul 2006 22:09:57 -0400 committer Len Brown Sun, 09 Jul 2006 22:09:57 -0400 ACPI: ACPI_DOCK Kconfig HOTPLUG_PCI_ACPI depends on ACPI_DOCK ACPI_IBM_DOCK depends on ACPI_DOCK=n ACPI_DOCK is EXPERIMENTAL, though that doesn't seem to mean much Signed-off-by: Len Brown commit b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d tree 28b98f21dd108864d2edc11d179cb48c118b2cf8 parent 09075ef0fd585fb093bb9a6cd1240272114f89cf author Stephane Eranian Sun, 09 Jul 2006 21:12:39 -0400 committer Linus Torvalds Sun, 09 Jul 2006 18:47:12 -0700 [PATCH] i386: use thread_info flags for debug regs and IO bitmaps Use thread info flags to track use of debug registers and IO bitmaps. - add TIF_DEBUG to track when debug registers are active - add TIF_IO_BITMAP to track when I/O bitmap is used - modify __switch_to() to use the new TIF flags Performance tested on Pentium II, ten runs of LMbench context switch benchmark (smaller is better:) before after avg 3.65 3.39 min 3.55 3.33 Signed-off-by: Stephane Eranian Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Andi Kleen Signed-off-by: Linus Torvalds commit 09075ef0fd585fb093bb9a6cd1240272114f89cf tree c01d2cc260a18df73f785bea4de1c1cfbcbbd16f parent c87fed1546bd00b42ee75f26c6b45393e4bf7559 parent 1b30dd359ebec22d035e8b145751319f63772ca1 author Linus Torvalds Sun, 09 Jul 2006 15:50:41 -0700 committer Linus Torvalds Sun, 09 Jul 2006 15:50:41 -0700 Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD * HEAD: [AX.25]: Use kzalloc [ATM] net/atm/clip.c: fix PROC_FS=n compile [PKT_SCHED]: act_api: Fix module leak while flushing actions [NET]: Fix IPv4/DECnet routing rule dumping [NET] gso: Fix up GSO packets with broken checksums [NET] gso: Add skb_is_gso [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init() [ATM]: fix possible recursive locking in skb_migrate() [ATM]: Typo in drivers/atm/Kconfig... [TG3]: add amd8131 to "write reorder" chipsets [NET]: Fix network device interface printk message priority commit c87fed1546bd00b42ee75f26c6b45393e4bf7559 tree 2ef383dcd1cb569e1b0da9c26c7e868f114bfd7b parent 84e74f6b770efe7c9beb604118695aa311b969f5 parent 70f05366b71c51c35c25c0b76b4318fbc26c975a author Linus Torvalds Sun, 09 Jul 2006 15:50:06 -0700 committer Linus Torvalds Sun, 09 Jul 2006 15:50:06 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (23 commits) [PATCH] 8139too deadlock fix [netdrvr] 3c59x: snip changelog from source code e1000: increase version to 7.1.9-k2 e1000: add ich8lan device ID's e1000: allow user to disable ich8 lock loss workaround e1000: integrate ich8 support into driver e1000: add ich8lan core functions e1000: disable ERT e1000: check return value of _get_speed_and_duplex e1000: M88 PHY workaround e1000: fix adapter led blinking inconsistency e1000: disable CRC stripping workaround e1000: force register write flushes to circumvent broken platforms e1000: rework module param code with uninitialized values e1000: recycle skb e1000: change printk into DPRINTK e1000: add smart power down code e1000: small performance tweak by removing double code e1000: fix CONFIG_PM blocks e1000: Make PHY powerup/down a function ... commit 84e74f6b770efe7c9beb604118695aa311b969f5 tree a242b29d44b85e510481232b09b2371572570ff8 parent 953969ddf5b049361ed1e8471cc43dc4134d2a6f parent 1959d21232931dfa686769a21161413f10d6652f author Linus Torvalds Sun, 09 Jul 2006 15:49:36 -0700 committer Linus Torvalds Sun, 09 Jul 2006 15:49:36 -0700 Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block * 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] Only the first two bits in bio->bi_rw and rq->flags match [PATCH] blktrace: readahead support [PATCH] blktrace: fix barrier vs sync typo commit c8f7a62cdde461914c6457d5f4362538ed810bf4 tree 62f8cc2dc2b1c9abb6364b16f3b218a04d121f3e parent 953969ddf5b049361ed1e8471cc43dc4134d2a6f author Len Brown Sun, 09 Jul 2006 17:22:28 -0400 committer Len Brown Sun, 09 Jul 2006 17:22:28 -0400 Revert "Revert "ACPI: dock driver"" This reverts 953969ddf5b049361ed1e8471cc43dc4134d2a6f commit. commit ab8aa06a5c0b75974fb1949365cbb20a15cedf14 tree 8498b3b3222198c45fa322b6fdd3215687dc30e4 parent 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e author Len Brown Fri, 07 Jul 2006 20:11:07 -0400 committer Len Brown Sun, 09 Jul 2006 15:19:44 -0400 ACPI: acpi_os_get_thread_id() returns current Linux mutexes and the debug code that that reference acpi_os_get_thread_id() are happy with 0. But the AML mutexes in exmutex.c expect a unique non-zero number for each thread - as they track this thread_id to permit the mutex re-entrancy defined by the ACPI spec. http://bugzilla.kernel.org/show_bug.cgi?id=6687 Signed-off-by: Len Brown commit f6dd9221dddb3550e60d32aee688588ec208312c tree dbde18df728775aaf5be5c4526fbfd4c3f398cd5 parent 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e author Bob Moore Fri, 07 Jul 2006 20:44:38 -0400 committer Len Brown Sun, 09 Jul 2006 15:15:40 -0400 ACPI: ACPICA 20060707 Added the ACPI_PACKED_POINTERS_NOT_SUPPORTED macro to support C compilers that do not allow the initialization of address pointers within packed structures - even though the hardware itself may support misaligned transfers. Some of the debug data structures are packed by default to minimize size. Added an error message for the case where acpi_os_get_thread_id() returns zero. A non-zero value is required by the core ACPICA code to ensure the proper operation of AML mutexes and recursive control methods. The DSDT is now the only ACPI table that determines whether the AML interpreter is in 32-bit or 64-bit mode. Not really a functional change, but the hooks for per-table 32/64 switching have been removed from the code. A clarification to the ACPI specification is forthcoming in ACPI 3.0B. Fixed a possible leak of an Owner ID in the error path of tbinstal.c acpi_tb_init_table_descriptor() and migrated all table OwnerID deletion to a single place in acpi_tb_uninstall_table() to correct possible leaks when using the acpi_tb_delete_tables_by_type() interface (with assistance from Lance Ortiz.) Fixed a problem with Serialized control methods where the semaphore associated with the method could be over-signaled after multiple method invocations. Fixed two issues with the locking of the internal namespace data structure. Both the Unload() operator and acpi_unload_table() interface now lock the namespace during the namespace deletion associated with the table unload (with assistance from Linn Crosetto.) Fixed problem reports (Valery Podrezov) integrated: - Eliminate unnecessary memory allocation for CreateXxxxField http://bugzilla.kernel.org/show_bug.cgi?id=5426 Fixed problem reports (Fiodor Suietov) integrated: - Incomplete cleanup branches in AcpiTbGetTableRsdt (BZ 369) - On Address Space handler deletion, needless deactivation call (BZ 374) - AcpiRemoveAddressSpaceHandler: validate Device handle parameter (BZ 375) - Possible memory leak, Notify sub-objects of Processor, Power, ThermalZone (BZ 376) - AcpiRemoveAddressSpaceHandler: validate Handler parameter (BZ 378) - Minimum Length of RSDT should be validated (BZ 379) - AcpiRemoveNotifyHandler: return AE_NOT_EXIST if Processor Obj has no Handler (BZ (380) - AcpiUnloadTable: return AE_NOT_EXIST if no table of specified type loaded (BZ 381) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 1b30dd359ebec22d035e8b145751319f63772ca1 tree 1efbdc5573940817dac79672357e1c2fa1ed6a28 parent 24781734643ea2e9fd864f58000e47793e2dcb04 author Ralf Baechle Sun, 09 Jul 2006 12:14:22 -0700 committer David S. Miller Sun, 09 Jul 2006 12:14:22 -0700 [AX.25]: Use kzalloc Replace kzalloc instead of kmalloc + memset. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 24781734643ea2e9fd864f58000e47793e2dcb04 tree 9da1bd808ed3a772620a4b2edd4ebad38eab97eb parent ebbaeab18b1c520054ea70e512ac0db7456ede01 author Adrian Bunk Sun, 09 Jul 2006 12:13:18 -0700 committer David S. Miller Sun, 09 Jul 2006 12:13:18 -0700 [ATM] net/atm/clip.c: fix PROC_FS=n compile This patch fixes the following compile error with CONFIG_PROC_FS=n by reverting commit dcdb02752ff13a64433c36f2937a58d93ae7a19e: <-- snip --> ... CC net/atm/clip.o net/atm/clip.c: In function ‘atm_clip_init’: net/atm/clip.c:975: error: ‘atm_proc_root’ undeclared (first use in this function) net/atm/clip.c:975: error: (Each undeclared identifier is reported only once net/atm/clip.c:975: error: for each function it appears in.) net/atm/clip.c:977: error: ‘arp_seq_fops’ undeclared (first use in this function) make[2]: *** [net/atm/clip.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit ebbaeab18b1c520054ea70e512ac0db7456ede01 tree ec988cfac2d90ff4467b61953dccba0f67ed9b48 parent 26e0fd1ce2418b10713b569a195bdb679233066b author Thomas Graf Sun, 09 Jul 2006 11:36:23 -0700 committer David S. Miller Sun, 09 Jul 2006 11:36:23 -0700 [PKT_SCHED]: act_api: Fix module leak while flushing actions Module reference needs to be given back if message header construction fails. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 953969ddf5b049361ed1e8471cc43dc4134d2a6f tree e4b84effa78a7e34d516142ee8ad1441906e33de parent b862f3b099f3ea672c7438c0b282ce8201d39dfc author Linus Torvalds Sun, 09 Jul 2006 08:47:46 -0700 committer Linus Torvalds Sun, 09 Jul 2006 08:47:46 -0700 Revert "ACPI: dock driver" This reverts commit a5e1b94008f2a96abf4a0c0371a55a56b320c13e. Adrian Bunk points out that it has build errors, and apparently no maintenance. Throw it out. Signed-off-by: Linus Torvalds commit b862f3b099f3ea672c7438c0b282ce8201d39dfc tree 62f8cc2dc2b1c9abb6364b16f3b218a04d121f3e parent e2a3d40258fe20d205f8ed592e1e2c0d5529c2e1 author Linus Torvalds Sat, 08 Jul 2006 15:24:18 -0700 committer Linus Torvalds Sat, 08 Jul 2006 15:24:18 -0700 i386: improve and correct inline asm memory constraints Use "+m" rather than a combination of "=m" and "m" for improved clarity and consistency. This also fixes some inlines that incorrectly didn't tell the compiler that they read the old value at all, potentially causing the compiler to generate bogus code. It appear that all of those potential bugs were hidden by the use of extra "volatile" specifiers on the data structures in question, though. Signed-off-by: Linus Torvalds commit e2a3d40258fe20d205f8ed592e1e2c0d5529c2e1 tree b8d778fb559c581e08bfc86831d16ee1cd43c841 parent a496e25dfb25493a57bcee5d66875d6ff80a9093 author Linus Torvalds Sat, 08 Jul 2006 15:00:28 -0700 committer Linus Torvalds Sat, 08 Jul 2006 15:00:28 -0700 power: improve inline asm memory constraints Use "+m" rather than a combination of "=m" and "m" for improved clarity and consistency. Signed-off-by: Linus Torvalds commit 26e0fd1ce2418b10713b569a195bdb679233066b tree afe1e76e4285fe79d291726d55a466f7bdc69305 parent a430a43d087545c96542ee64573237919109d370 author Patrick McHardy Sat, 08 Jul 2006 13:38:55 -0700 committer David S. Miller Sat, 08 Jul 2006 13:38:55 -0700 [NET]: Fix IPv4/DECnet routing rule dumping When more rules are present than fit in a single skb, the remaining rules are incorrectly skipped. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a430a43d087545c96542ee64573237919109d370 tree 653b630298505d5a65e2e094868d83014e4b0dc4 parent 89114afd435a486deb8583e89f490fc274444d18 author Herbert Xu Sat, 08 Jul 2006 13:34:56 -0700 committer David S. Miller Sat, 08 Jul 2006 13:34:56 -0700 [NET] gso: Fix up GSO packets with broken checksums Certain subsystems in the stack (e.g., netfilter) can break the partial checksum on GSO packets. Until they're fixed, this patch allows this to work by recomputing the partial checksums through the GSO mechanism. Once they've all been converted to update the partial checksum instead of clearing it, this workaround can be removed. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 89114afd435a486deb8583e89f490fc274444d18 tree 800e784ba59755f9f3c9926a6992e1d0f5b8eec7 parent 9c6c6795eda34e4dc38ecac912a16b6314082beb author Herbert Xu Sat, 08 Jul 2006 13:34:32 -0700 committer David S. Miller Sat, 08 Jul 2006 13:34:32 -0700 [NET] gso: Add skb_is_gso This patch adds the wrapper function skb_is_gso which can be used instead of directly testing skb_shinfo(skb)->gso_size. This makes things a little nicer and allows us to change the primary key for indicating whether an skb is GSO (if we ever want to do that). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9c6c6795eda34e4dc38ecac912a16b6314082beb tree ed3dbc45df5794dc229bb2e439875b050ea80ab9 parent 1252ecf63f77ea147bd40f5462c7d9e3d3ae2815 author Adrian Bunk Sat, 08 Jul 2006 13:33:28 -0700 committer David S. Miller Sat, 08 Jul 2006 13:33:28 -0700 [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init() The Coverity checker spotted, that from the changes from commit 898b1d16f8230fb912a0c2248df685735c6ceda3 the if (ret) platform_driver_unregister(&ali_ircc_driver); was dead code. This patch changes this function to what seems to have been the intention. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 1252ecf63f77ea147bd40f5462c7d9e3d3ae2815 tree 15f6fd4d0672ae3c0dc371394aa92874fd619dfd parent 00181fc94648b4bb30d30ef95506055105316051 author Arjan van de Ven Sat, 08 Jul 2006 13:30:52 -0700 committer David S. Miller Sat, 08 Jul 2006 13:30:52 -0700 [ATM]: fix possible recursive locking in skb_migrate() ok this is a real potential deadlock in a way, it takes two locks of 2 skbuffs without doing any kind of lock ordering; I think the following patch should fix it. Just sort the lock taking order by address of the skb.. it's not pretty but it's the best this can do in a minimally invasive way. Signed-off-by: Arjan van de Ven Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 00181fc94648b4bb30d30ef95506055105316051 tree c7908f569323822bc939cfde6b59f54374135297 parent c165b0040502ef0d2b5751eef3cd96ea8210ae4c author Matt LaPlante Sat, 08 Jul 2006 13:30:09 -0700 committer David S. Miller Sat, 08 Jul 2006 13:30:09 -0700 [ATM]: Typo in drivers/atm/Kconfig... From: Matt LaPlante Signed-off-by: Charles Williams Signed-off-by: David S. Miller commit c165b0040502ef0d2b5751eef3cd96ea8210ae4c tree e552663a164e010f87cfca0b2b398e8cc2e1b560 parent 5a8da02ba59a9f978e2af4c5da9a029ea5f5ee3b author John W. Linville Sat, 08 Jul 2006 13:28:53 -0700 committer David S. Miller Sat, 08 Jul 2006 13:28:53 -0700 [TG3]: add amd8131 to "write reorder" chipsets Add the AMD 8131 bridge to the list of chipsets that reorder writes. Signed-off-by: John W. Linville Acked-by: Michael Chan Signed-off-by: David S. Miller commit 5a8da02ba59a9f978e2af4c5da9a029ea5f5ee3b tree 83d71021f6fd59eb42fa6d3326ab0fb4419b6e25 parent 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e author Stephen Hemminger Fri, 07 Jul 2006 16:54:05 -0700 committer David S. Miller Fri, 07 Jul 2006 16:54:05 -0700 [NET]: Fix network device interface printk message priority The printk's in the network device interface code should all be tagged with severity. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a496e25dfb25493a57bcee5d66875d6ff80a9093 tree e0dc7f0f8151f6cf0ddc9ef987a6750e4e4a9ea3 parent 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e author Dave Jones Fri, 07 Jul 2006 12:31:27 -0400 committer Linus Torvalds Fri, 07 Jul 2006 09:46:45 -0700 [PATCH] Fix cpufreq vs hotplug lockdep recursion. [ There's some not quite baked bits in cpufreq-git right now so sending this on as a patch instead ] On Thu, 2006-07-06 at 07:58 -0700, Tom London wrote: > After installing .2356 I get this each time I boot: > ======================================================= > [ INFO: possible circular locking dependency detected ] > ------------------------------------------------------- > S06cpuspeed/1620 is trying to acquire lock: > (dbs_mutex){--..}, at: [] mutex_lock+0x21/0x24 > > but task is already holding lock: > (cpucontrol){--..}, at: [] mutex_lock+0x21/0x24 > > which lock already depends on the new lock. > make sure the cpu hotplug recursive mutex (yuck) is taken early in the cpufreq codepaths to avoid a AB-BA deadlock. Signed-off-by: Arjan van de Ven Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 70f05366b71c51c35c25c0b76b4318fbc26c975a tree d31230b93ba7df50d87eb11b1dba091641a9b89e parent c0bc8721b8d0380ec69fa97578c91201201b05a9 parent 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e author Jeff Garzik Thu, 06 Jul 2006 13:07:32 -0400 committer Jeff Garzik Thu, 06 Jul 2006 13:07:32 -0400 Merge branch 'master' into upstream commit 1959d21232931dfa686769a21161413f10d6652f tree c311b9fce998ce66665bda261c470a6fb981aa5c parent 40359ccb836866435b03a0cb57345002b587d875 author Jens Axboe Thu, 06 Jul 2006 10:18:05 +0200 committer Jens Axboe Thu, 06 Jul 2006 10:18:05 +0200 [PATCH] Only the first two bits in bio->bi_rw and rq->flags match Not three, as assumed. This causes the barrier bit to be needlessly set for some IO. Signed-off-by: Jens Axboe commit 40359ccb836866435b03a0cb57345002b587d875 tree 4e0530a7759ba9802658901432a89683fbb0965d parent fc0a75ce4835187a3f76d6b35f0644d1b168eef5 author Nathan Scott Thu, 06 Jul 2006 10:03:28 +0200 committer Jens Axboe Thu, 06 Jul 2006 10:03:28 +0200 [PATCH] blktrace: readahead support Provide the needed kernel support for distinguishing readahead from regular read requests when tracing block devices. Signed-off-by: Nathan Scott Signed-off-by: Jens Axboe commit fc0a75ce4835187a3f76d6b35f0644d1b168eef5 tree a474693e464ca847c045b7e29d748adc9fcef4ea parent 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e author Nathan Scott Thu, 06 Jul 2006 09:56:30 +0200 committer Jens Axboe Thu, 06 Jul 2006 09:56:30 +0200 [PATCH] blktrace: fix barrier vs sync typo Signed-off-by: Nathan Scott Signed-off-by: Jens Axboe commit c0bc8721b8d0380ec69fa97578c91201201b05a9 tree b027c9aa8e0d601ebe6c86bddc181c4d4ecc7cda parent bce305f4fe779f29d99d414685243f5da0803254 parent e4ac9773be2ea01b707da0496ab1527ec6cdda4e author Jeff Garzik Wed, 05 Jul 2006 14:32:39 -0400 committer Jeff Garzik Wed, 05 Jul 2006 14:32:39 -0400 Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream Conflicts: drivers/net/e1000/e1000_main.c commit bce305f4fe779f29d99d414685243f5da0803254 tree 67072c37319f3c6b091dec8094d342118fe3fd62 parent 20ed7c094dfe33b0e15e8c60f60012b9278631d3 author Arjan van de Ven Wed, 05 Jul 2006 15:00:40 +0200 committer Jeff Garzik Wed, 05 Jul 2006 14:29:26 -0400 [PATCH] 8139too deadlock fix > stack backtrace: > [] rtl8139_start_xmit+0xd9/0xff [8139too] > [] netpoll_send_skb+0x98/0xea This seems to be a real deadlock... So netpoll_send_skb takes the _xmit_lock, which is all nitty gritty but then rtl8139_start_xmit comes around while that lock is taken, and does spin_unlock_irq(&tp->lock); which.. enables interrupts and softirqs; this is quite bad because the xmit lock is taken in softirq context for the watchdog like this: [] _spin_lock+0x23/0x32 [] dev_watchdog+0x14/0xb1 [] run_timer_softirq+0xf2/0x14a [] __do_softirq+0x55/0xb0 [] do_softirq+0x58/0xbd Which would deadlock now that the spin_unlock_irq() has enabled irqs/softirqs while the _xmit_lock is still held. The patch below turns this into a irqsave/irqrestore pair so that interrupts don't get enabled unconditionally. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Jeff Garzik commit 20ed7c094dfe33b0e15e8c60f60012b9278631d3 tree f2f3eb3cff4c30c71bce509467a404557a744ba0 parent 2c1a108890c5b57cf3f7d7909f55c4fae0f52f19 author Jeff Garzik Wed, 05 Jul 2006 14:28:34 -0400 committer Jeff Garzik Wed, 05 Jul 2006 14:28:34 -0400 [netdrvr] 3c59x: snip changelog from source code Driver source code is not the preferred place to store change history. Acked-by: Andrew Morton Signed-off-by: Jeff Garzik commit e4ac9773be2ea01b707da0496ab1527ec6cdda4e tree aef802a2f232a045602ef658bb1649654ce89172 parent ae2c3860eb18712b71861bb6fc8d7e11e0f79e6d author Auke Kok Tue, 27 Jun 2006 09:08:34 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:34 -0700 e1000: increase version to 7.1.9-k2 Increment the version to 7.1.9-k2 Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit ae2c3860eb18712b71861bb6fc8d7e11e0f79e6d tree eb02955cfaf655b92ce028c5e54ae1bc0219b673 parent 1f9e7e3d32f7ff3fd3a936fc9ad59770b3d29774 author Auke Kok Tue, 27 Jun 2006 09:08:30 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:30 -0700 e1000: add ich8lan device ID's Add the device ID's of the supported ICH8 LAN devices. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 1f9e7e3d32f7ff3fd3a936fc9ad59770b3d29774 tree d80adcc2c623935f8e2387dedb066ca8d0c46641 parent cd94dd0b648ceb64ca5e41d9ccfa99c1e30e92ef author Auke Kok Tue, 27 Jun 2006 09:08:26 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:26 -0700 e1000: allow user to disable ich8 lock loss workaround The workaround for the ich8 lock loss problem is only needed for a very small amount of systems. This adds an option for the user to disable the workaround. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit cd94dd0b648ceb64ca5e41d9ccfa99c1e30e92ef tree 48144ae7c119c5cc7e61d42c670609540c3c7e9d parent d37ea5d56293b7a883d2a993df5d8b9fb660ed3b author Auke Kok Tue, 27 Jun 2006 09:08:22 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:22 -0700 e1000: integrate ich8 support into driver This hooks up the ich8 structure into the driver itself. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit d37ea5d56293b7a883d2a993df5d8b9fb660ed3b tree b0b5120c66c8fc44e93cc3e708de52c6eaed98ad parent ab7bc0ad72a12ef8eacc1560c9342aa567f3531d author Auke Kok Tue, 27 Jun 2006 09:08:17 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:17 -0700 e1000: add ich8lan core functions This implements the core new functions needed for ich8's internal NIC. This includes: * ich8 specific read/write code * flash/nvm access code * software semaphore flag functions * 10/100 PHY (fe - no gigabit speed) support for low-end versions * A workaround for a powerdown sequence problem discovered that affects a small number of motherboard. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit ab7bc0ad72a12ef8eacc1560c9342aa567f3531d tree 935ea7423189eb59ec9be5c841961ecd6b749309 parent 592600a0536f0d5aab4dc95f19515a37d03430f8 author Auke Kok Tue, 27 Jun 2006 09:08:13 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:13 -0700 e1000: disable ERT Hardware is reported to have problems with ERT. We disable it for all hardware to make sure we are not seeing unexplainable user problems. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 592600a0536f0d5aab4dc95f19515a37d03430f8 tree 94b166da5afa2f5494e5154e6ef7109990d2c112 parent ee04022a21764a12e29eee144b72344ebfe0a55c author Auke Kok Tue, 27 Jun 2006 09:08:09 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:09 -0700 e1000: check return value of _get_speed_and_duplex We were not checking the return value of get_speed_and_duplex properly, whih may contain an error value. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit ee04022a21764a12e29eee144b72344ebfe0a55c tree 88744e14d2df93fe287abc39b0d4446ae159a7ae parent f1b3a85354d3877fae45ef448e7e49c2efd692d5 author Auke Kok Tue, 27 Jun 2006 09:08:03 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:03 -0700 e1000: M88 PHY workaround M88 rev 2 PHY needs a longer downshift to function properly. This adds a much longer downshift counter for this specific device. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit f1b3a85354d3877fae45ef448e7e49c2efd692d5 tree ed0422f71c8c2b68b96ef5ccdfb2d15904e17eaf parent 7dfee0cb1d506897805b663dd95e9651619a4d4d author Auke Kok Tue, 27 Jun 2006 09:07:56 -0700 committer Auke Kok Tue, 27 Jun 2006 09:07:56 -0700 e1000: fix adapter led blinking inconsistency Several e1000 adapters were not blinking correctly or inconsistently. This patch cleans this up and makes them all behave the same as far as possible. Signed-off-by: Jeff Kirsher Signed-off-by: Auke Kok commit 7dfee0cb1d506897805b663dd95e9651619a4d4d tree a678e0e82d0766561c721146e6b0f975a48758ae parent 4ca213a6957318219822c024c8e4c61b3e42a7dc author Auke Kok Tue, 27 Jun 2006 09:07:50 -0700 committer Auke Kok Tue, 27 Jun 2006 09:07:50 -0700 e1000: disable CRC stripping workaround CRC stripping is breaking SMBUS-connected BMC's. We disable this feature to make it work. This fixes related bugs regarding SOL. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 4ca213a6957318219822c024c8e4c61b3e42a7dc tree 9bef34eab2afb685c9e61d0a34bab6ff5c0811f3 parent 17231712ab89fa085bc235ef19c1e6e0c163e4fc author Auke Kok Tue, 27 Jun 2006 09:07:08 -0700 committer Auke Kok Tue, 27 Jun 2006 09:07:08 -0700 e1000: force register write flushes to circumvent broken platforms A certain AMD64 bridge (8132) has an option to turn on write combining which breaks our adapter. To circumvent this we need to flush every write. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 17231712ab89fa085bc235ef19c1e6e0c163e4fc tree 0d1a97d85030591379d8cad0a5dafbf6855b24f6 parent 864c4e45ec6d1bfe16a14d887d5baad201419aba author Auke Kok Tue, 27 Jun 2006 09:06:59 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:59 -0700 e1000: rework module param code with uninitialized values We can take uninitialized values into account which minimizes code and allows us to simplify the parameter checking code greatly. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 864c4e45ec6d1bfe16a14d887d5baad201419aba tree 6908a76df95c8f771ae85842bbf3f9a476bf3690 parent a5eafce2ce2fd3a1956657d85908ca691b870e5d author Auke Kok Tue, 27 Jun 2006 09:06:53 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:53 -0700 e1000: recycle skb Recycle an skb to improve performance a bit. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit a5eafce2ce2fd3a1956657d85908ca691b870e5d tree 36577236b2db39ea25dd38100d8827b0d68339fc parent 9a53a2029885e0088e9149679215b95d04deb57b author Auke Kok Tue, 27 Jun 2006 09:06:49 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:49 -0700 e1000: change printk into DPRINTK Changing a printk message to make clear that this message is originating from e1000. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 9a53a2029885e0088e9149679215b95d04deb57b tree e81f69cb79cc7f43332184b51c1213a14842dad9 parent 0cbabbb0725fa34a37d6b7870b2d2fe17d1a0a94 author Auke Kok Tue, 27 Jun 2006 09:06:45 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:45 -0700 e1000: add smart power down code Smart Power Down is a power saving feature in newer e1000 hardware. We disable it because it causes time to link to be long, but make it a user choice. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 0cbabbb0725fa34a37d6b7870b2d2fe17d1a0a94 tree eba11d71ae8995a3f51a1d0f701ec1fa849d09d4 parent 6fdfef162426766611b1f640138e4720f56e45f8 author Auke Kok Tue, 27 Jun 2006 09:06:41 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:41 -0700 e1000: small performance tweak by removing double code buffer_info is already filled at the end of this while() loop. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 6fdfef162426766611b1f640138e4720f56e45f8 tree b1525d28996ed47b99e53c625bc9cb0d238227fa parent 79f05bf0ba9b41561600f3cdfdf86b5184fc6675 author Auke Kok Tue, 27 Jun 2006 09:06:36 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:36 -0700 e1000: fix CONFIG_PM blocks e1000_suspend is called even when !CONFIG_PM. The non-PM code inside of it is properly #ifdef'd. This fixes the compiler warnings when !CONFIG_PM. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 79f05bf0ba9b41561600f3cdfdf86b5184fc6675 tree 74530615703e52b238ec38c2fac2670a2493113e parent 2db10a081c5c1082d58809a1bcf1a6073f4db160 author Auke Kok Tue, 27 Jun 2006 09:06:32 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:32 -0700 e1000: Make PHY powerup/down a function In relation to the irq work done earlier we also move the PHY powerup and powerdown functions into separate functions and move the calls to _close and _open, making the PHY stay in it's power state as long as the device is _up. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 2db10a081c5c1082d58809a1bcf1a6073f4db160 tree f54772ef60f2c5bf5f8d602a83d6dc508158a0e0 parent acfbc9fde2ec7f304398f6ad7644002e07bf84bc author Auke Kok Tue, 27 Jun 2006 09:06:28 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:28 -0700 e1000: rework driver hardware reset locking After studying the driver mac reset code it was found that there were multiple race conditions possible to reset the unit twice or bring it e1000_up() double. This fixes all occurences where the driver needs to reset the mac. We also remove irq requesting/releasing into _open and _close so that while the device is _up we will never touch the irq's. This fixes the double free irq bug that people saw. To make sure that the watchdog task doesn't cause another race we let it run as a non-scheduled task. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit acfbc9fde2ec7f304398f6ad7644002e07bf84bc tree 346a872fc0624dc2bdbef913cb882a8337c61abf parent 0d204094d15dac2e8a439b993f71eda385b4dccd author Auke Kok Tue, 27 Jun 2006 09:06:24 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:24 -0700 e1000: fix loopback ethtool test Ethtool was reporting that loopback failed randomly on esb2 systems. Upon study it was found that the phy manual was changed with respect to the loopback mode bits. The new value fixes it. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 0d204094d15dac2e8a439b993f71eda385b4dccd tree 647f0ddec94d0fb4aaf74fa55bcad75946030f8a parent a487a8f7b6947f6445e5a1aa876522916785d5ec parent 612eff0e3715a6faff5ba1b74873b99e036c59fe author Auke Kok Wed, 21 Jun 2006 13:43:50 -0700 committer Auke-jan Kok Wed, 21 Jun 2006 13:43:50 -0700 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit a487a8f7b6947f6445e5a1aa876522916785d5ec tree a64fb0d90dce25095558b89de86a2d9a6d340d21 parent cac925a4aab1b7233d3beb591f53498816058a08 author Auke Kok Fri, 09 Jun 2006 11:29:03 -0700 committer Auke Kok Fri, 09 Jun 2006 11:29:03 -0700 e1000: prevent statistics from garbling during bus resets If a PCI bus error/fault triggers a PCI bus reset, attempts to get the ethernet packet count statistics from the hardware will fail, returning garbage data upstream. This patch skips statistics data collection if the PCI device is not on the bus. Signed-off-by: Linas Vepstas Cc: Jesse Brandeburg Signed-off-by: Andrew Morton Acked-by: Auke Kok