| e7c243c | Evgeniy Polyakov | 25 August 2007, 06:36:29 UTC | [VLAN/BRIDGE]: Fix "skb_pull_rcsum - Fatal exception in interrupt" I tried to preserve bridging code as it was before, but logic is quite strange - I think we should free skb on error, since it is already unshared and thus will just leak. Herbert Xu states: > + if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) > + goto out; If this happens it'll be a double-free on skb since we'll return NF_DROP which makes the caller free it too. We could return NF_STOLEN to prevent that but I'm not sure whether that's correct netfilter semantics. Patrick, could you please make a call on this? Patrick McHardy states: NF_STOLEN should work fine here. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:47 UTC |
| 7c8347a | Jesper Juhl | 25 August 2007, 06:25:33 UTC | [ISDN]: Get rid of some pointless allocation casts in common and bsd comp. vmalloc() returns a void pointer - no need to cast the return value. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:46 UTC |
| c573f73 | Jesper Juhl | 25 August 2007, 06:24:43 UTC | [NET]: Avoid pointless allocation casts in BSD compression module The general kernel memory allocation functions return void pointers and there is no need to cast their return values. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:45 UTC |
| 901ded2 | Jesper Juhl | 25 August 2007, 06:23:41 UTC | [IRDA]: Do not do pointless kmalloc return value cast in KingSun driver kmalloc() returns a void pointer, so there is no need to cast it in drivers/net/irda/kingsun-sir.c::kingsun_probe(). Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:44 UTC |
| aaa53c4 | Benjamin Thery | 25 August 2007, 06:12:08 UTC | [NET]: Fix crash in dev_mc_sync()/dev_mc_unsync() This patch fixes a crash that may occur when the routine dev_mc_sync() deletes an address from the list it is currently going through. It saves the pointer to the next element before deleting the current one. The problem may also exist in dev_mc_unsync(). Signed-off-by: Benjamin Thery <benjamin.thery@bull.net> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:43 UTC |
| f424bb9 | Al Viro | 25 August 2007, 06:04:18 UTC | [PPPOL2TP]: Fix endianness annotations. {s,d}_{session,tunnel} in pppol2tp_addr are actually host-endian everywhere. We might switch them to net-endian, of course, but that structure is exposed to userland via getname... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:42 UTC |
| e422397 | Shannon Nelson | 25 August 2007, 06:02:53 UTC | [IOAT]: ioatdma needs to to play nice in a multi-dma-client world Now that the DMA engine has a multi-client interface, fix the ioatdma driver to play along. At the same time, remove a couple of unnecessary reads and writes. Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:40 UTC |
| 97a1ad4 | Stephen Hemminger | 25 August 2007, 05:38:26 UTC | [SLIP]: trivial sparse warning fix Function declared static in forward declaration, but not in actual code. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:39 UTC |
| 37d2e73 | Stephen Hemminger | 25 August 2007, 05:37:49 UTC | [EQL]: sparse warning fix More noodlin on long flights, patch bin. Sparse warning fix for eql. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:38 UTC |
| c3609d5 | vignesh babu | 25 August 2007, 05:27:55 UTC | [NET]: is_power_of_2 in net/core/neighbour.c Replacing n & (n - 1) for power of 2 check by is_power_of_2(n) Signed-off-by: vignesh babu <vignesh.babu@wipro.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:37 UTC |
| 2672287 | David S. Miller | 25 August 2007, 05:21:50 UTC | [TCP]: Describe tcp_init_cwnd() thoroughly in a comment. People often get tripped up by this function and think that it does not implemented the prescribed algorithms from RFC2414 and RFC3390, even though it does. So add a comment to head off such misunderstandings in the future. Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:36 UTC |
| a96fb49 | Flavio Leitner | 25 August 2007, 05:16:39 UTC | [NET]: Fix IP_ADD/DROP_MEMBERSHIP to handle only connectionless Fix IP[V6]_ADD_MEMBERSHIP and IP[V6]_DROP_MEMBERSHIP to return -EPROTO for connection oriented sockets. Signed-off-by: Flavio Leitner <fleitner@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:35 UTC |
| 36d98d3 | Stephen Hemminger | 22 August 2007, 19:36:01 UTC | [KBUILD]: Sanitize tc_ematch headers. The headers in tc_ematch are used by iproute2, so these headers should be processed. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:34 UTC |
| 96fe1c0 | Nick Bowler | 22 August 2007, 19:33:51 UTC | [IPSEC] AH4: Update IPv4 options handling to conform to RFC 4302. In testing our ESP/AH offload hardware, I discovered an issue with how AH handles mutable fields in IPv4. RFC 4302 (AH) states the following on the subject: For IPv4, the entire option is viewed as a unit; so even though the type and length fields within most options are immutable in transit, if an option is classified as mutable, the entire option is zeroed for ICV computation purposes. The current implementation does not zero the type and length fields, resulting in authentication failures when communicating with hosts that do (i.e. FreeBSD). I have tested record route and timestamp options (ping -R and ping -T) on a small network involving Windows XP, FreeBSD 6.2, and Linux hosts, with one router. In the presence of these options, the FreeBSD and Linux hosts (with the patch or with the hardware) can communicate. The Windows XP host simply fails to accept these packets with or without the patch. I have also been trying to test source routing options (using traceroute -g), but haven't had much luck getting this option to work *without* AH, let alone with. Signed-off-by: Nick Bowler <nbowler@ellipticsemi.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 27 August 2007, 01:35:33 UTC |
| 50c4663 | Ingo Molnar | 25 August 2007, 20:17:19 UTC | sched: s/sched_latency/sched_min_granularity runtime limit and wakeup granularity used to be a function of granularity and that was incorrect changed to sched_latency. Fix this to make wakeup granularity a function of min-granularity, and the runtime limit equal to latency. Signed-off-by: Ingo Molnar <mingo@elte.hu> | 25 August 2007, 20:17:19 UTC |
| a3ce8ea | Linus Torvalds | 25 August 2007, 18:25:29 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: cleanup, sched_granularity -> sched_min_granularity sched: adaptive scheduler granularity sched: fix CONFIG_SCHED_DEBUG dependency of lockdep sysctls | 25 August 2007, 18:25:29 UTC |
| f2154ee | Linus Torvalds | 25 August 2007, 18:24:53 UTC | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: Add ref-counting for sbp2 orbs (fix command abortion) firewire: fix unloading of fw-ohci while devices are attached ieee1394: sbp2: fix sbp2_remove_device for error cases | 25 August 2007, 18:24:53 UTC |
| 172ac3d | Ingo Molnar | 25 August 2007, 16:41:53 UTC | sched: cleanup, sched_granularity -> sched_min_granularity due to adaptive granularity scheduling the role of sched_granularity has changed to "minimum granularity", so rename the variable (and the tunable) accordingly. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> | 25 August 2007, 16:41:53 UTC |
| 2180508 | Peter Zijlstra | 25 August 2007, 16:41:53 UTC | sched: adaptive scheduler granularity Instead of specifying the preemption granularity, specify the wanted latency. By fixing the granlarity to a constany the wakeup latency it a function of the number of running tasks on the rq. Invert this relation. sysctl_sched_granularity becomes a minimum for the dynamic granularity computed from the new sysctl_sched_latency. Then use this latency to do more intelligent granularity decisions: if there are fewer tasks running then we can schedule coarser. This helps performance while still always keeping the latency target. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu> | 25 August 2007, 16:41:53 UTC |
| 1fc84aa | Peter Zijlstra | 25 August 2007, 16:41:52 UTC | sched: fix CONFIG_SCHED_DEBUG dependency of lockdep sysctls Make the lockdep sysctls not depend on CONFIG_SCHED_DEBUG. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu> | 25 August 2007, 16:41:52 UTC |
| e57d201 | Kristian Høgsberg | 24 August 2007, 22:59:58 UTC | firewire: Add ref-counting for sbp2 orbs (fix command abortion) This handles the case where we get the status write before getting the complete_transaction callback ("status write for unknown orb"). In this case, we just assume that the initial orb pointer transaction succeeded and finish the orb. To prevent the transaction callback from touching freed memory, we ref-count the orb structures. Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> | 25 August 2007, 16:00:27 UTC |
| 8a2d9ed | Stefan Richter | 20 August 2007, 23:05:14 UTC | firewire: fix unloading of fw-ohci while devices are attached Fix panic in run_timer_softirq right after "modprobe -r firewire-ohci" if a FireWire disk was attached and firewire-sbp2 loaded. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> | 25 August 2007, 16:00:27 UTC |
| a2ee3f9 | Stefan Richter | 11 August 2007, 09:51:16 UTC | ieee1394: sbp2: fix sbp2_remove_device for error cases Bug found by Olaf Hering <olh@suse.de>: sbp2util_remove_command_orb_pool requires a valid lu->hi pointer. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> | 25 August 2007, 16:00:26 UTC |
| 6ae26fa | Linus Torvalds | 25 August 2007, 15:01:53 UTC | Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 * 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: agp: balance ioremap checks agp: Add device id for P4M900 to via-agp module efficeon-agp leaks 'struct agp_bridge_data' in error paths of agp_efficeon_probe() | 25 August 2007, 15:01:53 UTC |
| 6869ce1 | Linus Torvalds | 25 August 2007, 15:01:06 UTC | Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: ioremap return value checks drm/via: Fix dmablit when blit queue is full drm_rmmap_ioctl(): remove dead code | 25 August 2007, 15:01:06 UTC |
| 36373b4 | Linus Torvalds | 25 August 2007, 14:59:59 UTC | 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: myri10ge: update driver version to 1.3.2-1.269 myri10ge: use pcie_get/set_readrq ehea: fix queue destructor ehea: fix module parameter description ehea: fix interface to DLPAR tools sgiseeq: Fix return type of sgiseeq_remove sky2 1.17 sky2: only bring up watchdog if link is active sky2: clear PCI power control reg at startup DM9000: fix interface hang under load phy layer: fix genphy_setup_forced (don't reset) Don't use GFP_DMA for zone allocation. fix realtek phy id in forcedeth | 25 August 2007, 14:59:59 UTC |
| 0b887d0 | Linus Torvalds | 25 August 2007, 14:54:38 UTC | 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: (30 commits) ACPI: work around duplicate name "VID" problem on T61 acpiphp_ibm: add missing '\n' to error message ACPI: add dump_stack() to trace acpi_format_exception programming errors make drivers/acpi/scan.c:create_modalias() static ACPI: Fix a warning of discarding qualifiers from pointer target type ACPI: "ACPI handle has no context!" should be KERN_DEBUG ACPI video hotkey: export missing ACPI video hotkey events via input layer ACPI: Validate XSDT, use RSDT if XSDT fails ACPI: /proc/acpi/thermal_zone trip points are now read-only, mark them as such ACPI: fix ia64 allnoconfig build PNP: remove null pointer checks PNP: remove MODULE infrastructure ISAPNP: removed unused isapnp_detected and ISAPNP_DEBUG PNPACPI: remove unnecessary casts of "void *" PNPACPI: simplify irq_flags() PNP: fix up after Lindent ACPI: enable GPEs before calling _WAK on resume asus-laptop: Fix rmmod of asus_laptop sony-laptop: call sonypi_compat_init earlier sony-laptop: enable Vaio FZ events ... | 25 August 2007, 14:54:38 UTC |
| 0769d39 | Scott Thompson | 25 August 2007, 08:17:49 UTC | drm: ioremap return value checks Signed-off-by: Scott Thompson <postfail <at> hushmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie> | 25 August 2007, 08:17:49 UTC |
| 5bdbc7d | Scott Thompson | 25 August 2007, 08:14:00 UTC | agp: balance ioremap checks patchset against 2.6.23-rc3. corrects missing ioremap return checks and balancing on iounmap calls, integrated changes per list recommendations on the original set of patches.. Signed-off-by: Scott Thompson <postfail <at> hushmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie> | 25 August 2007, 08:14:00 UTC |
| 32ddef9 | Xavier Bachelot | 25 August 2007, 08:10:52 UTC | agp: Add device id for P4M900 to via-agp module Signed-off-by: Dave Airlie <airlied@linux.ie> | 25 August 2007, 08:10:52 UTC |
| 2972863 | Brice Goglin | 24 August 2007, 06:57:54 UTC | myri10ge: update driver version to 1.3.2-1.269 Update myri10ge driver version to 1.3.2-1.269. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:25 UTC |
| 302d242 | Brice Goglin | 24 August 2007, 06:57:17 UTC | myri10ge: use pcie_get/set_readrq Based on a patch from Peter Oruba, convert myri10ge to use pcie_get_readrq() and pcie_set_readrq() instead of our own PCI calls and arithmetics. These driver changes incorporate the proposed PCI-X / PCI-Express read byte count interface. Reading and setting those values doesn't take place "manually", instead wrapping functions are called to allow quirks for some PCI bridges. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off by: Peter Oruba <peter.oruba@amd.com> Based on work by Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:22 UTC |
| 28721c8 | Jan-Bernd Themann | 22 August 2007, 14:21:28 UTC | ehea: fix queue destructor Includes hcp_epas_dtor in eq/cq/qp destructors to unmap HW register. Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:20 UTC |
| 18072a5 | Jan-Bernd Themann | 22 August 2007, 14:21:24 UTC | ehea: fix module parameter description Update the module parameter description of "use_mcs" to show correct default value Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:18 UTC |
| a8e34fd | Jan-Bernd Themann | 22 August 2007, 14:20:58 UTC | ehea: fix interface to DLPAR tools Userspace DLPAR tool expects decimal numbers to be written to and read from sysfs entries. Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:15 UTC |
| e3efb05 | Ralf Baechle | 22 August 2007, 15:03:52 UTC | sgiseeq: Fix return type of sgiseeq_remove The driver remove method needs to return an int not void. This was just never noticed because usually this driver is not being built as a module. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:13 UTC |
| c2cb71f | Stephen Hemminger | 21 August 2007, 21:34:04 UTC | sky2 1.17 Mark new version to track if current driver is in use. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:11 UTC |
| 32c2c30 | Stephen Hemminger | 21 August 2007, 21:34:03 UTC | sky2: only bring up watchdog if link is active This fixes the extra timer overhead that people were whining about as a 2.6.23 regression. Running the watchdog timer all the time is unneeded. Change it to run only if link is up, and reduce frequency to save power. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:08 UTC |
| b234577 | Stephen Hemminger | 21 August 2007, 21:34:02 UTC | sky2: clear PCI power control reg at startup Make sure PCI register for PHY power gets cleared on boot, and make sure to avoid any PCI posting problems. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:06 UTC |
| c46ac94 | Florian Westphal | 20 August 2007, 23:33:42 UTC | DM9000: fix interface hang under load When transferring data at full speed, the DM9000 network interface sometimes stops sending/receiving data. Worse, ksoftirqd consumes 100% cpu and the net tx watchdog never triggers. Fix by spin_lock_irqsave() in dm9000_start_xmit() to prevent the interrupt handler from interfering. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:04 UTC |
| bc1e0a0 | Domen Puncer | 17 August 2007, 06:54:45 UTC | phy layer: fix genphy_setup_forced (don't reset) Writing BMCR_RESET bit will reset MII_BMCR to default values. This is clearly not what we want. Signed-off-by: Domen Puncer <domen.puncer@telargo.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:31:02 UTC |
| 09e06f6 | Ralf Baechle | 15 August 2007, 11:53:16 UTC | Don't use GFP_DMA for zone allocation. IP32 doesn't even have a ZONE_DMA so no point in using GFP_DMA in any IP32-specific device driver. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:30:59 UTC |
| ba685fb | Willy Tarreau | 23 August 2007, 19:35:41 UTC | fix realtek phy id in forcedeth As noticed by Chuck Ebbert, commit c5e3ae8823693b260ce1f217adca8add1bc0b3de introduced a copy-paste typo, as realtek phy is 0x732 and not 0x1c1. Obvious fix below suggested by Ayaz Abdulla. Signed-off-by: Willy Tarreau <w@1wt.eu> Cc: Ayaz Abdulla <aabdulla@nvidia.com> Cc: Chuck Ebbert <cebbert@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 25 August 2007, 06:30:57 UTC |
| 136c4bb | Len Brown | 25 August 2007, 06:24:03 UTC | Pull bugzilla-8798 into release branch | 25 August 2007, 06:24:03 UTC |
| e6d9da1 | Zhang Rui | 25 August 2007, 06:23:31 UTC | ACPI: work around duplicate name "VID" problem on T61 This can only fix the problem that more than one video bus device have the same AML name "VID". ie. the proc I/F for the second "VID" video bus device is located under /proc/acpi/video/VID1/... As this is really rare and the ACPI proc I/F is a legacy feature that we are planning to remove. We won't provide a generic solution for this problem. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 25 August 2007, 06:23:31 UTC |
| 25c87f7 | Len Brown | 25 August 2007, 05:44:01 UTC | Pull events into release branch Conflicts: drivers/acpi/video.c Signed-off-by: Len Brown <len.brown@intel.com> | 25 August 2007, 05:44:01 UTC |
| a4fd494 | Len Brown | 25 August 2007, 05:40:27 UTC | Pull misc into release branch | 25 August 2007, 05:40:27 UTC |
| 5e1f198 | Jeremy Fitzhardinge | 25 August 2007, 05:31:45 UTC | acpiphp_ibm: add missing '\n' to error message Add missing \n to error in ibm_find_acpi_device. Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org> Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Cc: Greg Kroah-Hartman <gregkh@suse.de> Cc: Adrian Bunk <trivial@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com> | 25 August 2007, 05:39:13 UTC |
| 3e0d69e | Andrew Morton | 25 August 2007, 05:28:20 UTC | ACPI: add dump_stack() to trace acpi_format_exception programming errors Dump the stack so we can find the secretive caller to acpi_format_exception(). Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com> | 25 August 2007, 05:39:02 UTC |
| b3e572d | Adrian Bunk | 14 August 2007, 21:22:35 UTC | make drivers/acpi/scan.c:create_modalias() static This patch makes the needlessly global create_modalias() static. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Len Brown <len.brown@intel.com> | 25 August 2007, 05:38:51 UTC |
| 70b30fb | Al Viro | 21 August 2007, 15:18:20 UTC | ACPI: Fix a warning of discarding qualifiers from pointer target type drivers/acpi/ec.c: In function `acpi_ec_ecdt_probe': drivers/acpi/ec.c:873: warning: passing arg 1 of `acpi_get_devices' discards qualifiers from pointer target type Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Len Brown <len.brown@intel.com> | 25 August 2007, 05:38:40 UTC |
| ead7759 | Shaohua Li | 23 August 2007, 07:01:13 UTC | ACPI: "ACPI handle has no context!" should be KERN_DEBUG Signed-off-by: Shaohua Li <shaohua.li@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 25 August 2007, 05:38:20 UTC |
| a3a1b26 | Len Brown | 25 August 2007, 05:36:18 UTC | Pull suspend into release branch | 25 August 2007, 05:36:18 UTC |
| 4c8c95b | Len Brown | 25 August 2007, 02:26:27 UTC | Pull video into release branch | 25 August 2007, 02:26:27 UTC |
| 519ef1a | Len Brown | 25 August 2007, 02:26:19 UTC | Pull thermal into release branch | 25 August 2007, 02:26:19 UTC |
| e9dab19 | Luming Yu | 20 August 2007, 10:23:53 UTC | ACPI video hotkey: export missing ACPI video hotkey events via input layer Signed-off-by: Yu Luming <luming.yu@intel.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 25 August 2007, 02:23:46 UTC |
| b7011d5 | Len Brown | 25 August 2007, 02:20:31 UTC | Pull sony into release branch | 25 August 2007, 02:20:31 UTC |
| a672975 | Len Brown | 25 August 2007, 02:20:22 UTC | Pull pnp into release branch | 25 August 2007, 02:20:22 UTC |
| 4548a9d | Len Brown | 25 August 2007, 02:19:44 UTC | Pull ec into release branch | 25 August 2007, 02:19:44 UTC |
| de9bde9 | Len Brown | 25 August 2007, 02:19:20 UTC | Pull bugzilla-8630 into release branch | 25 August 2007, 02:19:20 UTC |
| 5a16eff | Len Brown | 25 August 2007, 02:19:05 UTC | Pull bugzilla-1641 into release branch | 25 August 2007, 02:19:05 UTC |
| 2e0f4c7 | Len Brown | 25 August 2007, 02:18:51 UTC | Pull battery into release branch | 25 August 2007, 02:18:51 UTC |
| ca1f32a | Len Brown | 25 August 2007, 02:18:44 UTC | Pull asus into release branch | 25 August 2007, 02:18:44 UTC |
| d1caeb0 | Linus Torvalds | 24 August 2007, 23:11:13 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: fix startup penalty calculation sched: simplify bonus calculation #2 sched: simplify bonus calculation #1 sched: tidy up and simplify the bonus balance sched: optimize task_tick_rt() a bit sched: simplify can_migrate_task() sched: remove HZ dependency from the granularity default sched: CONFIG_SCHED_GROUP_FAIR=y fixlet | 24 August 2007, 23:11:13 UTC |
| 37a3cc9 | Linus Torvalds | 24 August 2007, 23:10:56 UTC | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup: [x86 setup] Make sure AH=00h when setting a video mode [x86 setup] Volatilize asm() statements | 24 August 2007, 23:10:56 UTC |
| 6e106b0 | Randy Dunlap | 24 August 2007, 22:35:15 UTC | DM_MULTIPATH_RDAC: "scsi_normalize_sense" undefined DM_MULTIPATH_RDAC uses SCSI API(s) and is for a SCSI device, so add SCSI to its depends on to prevent build errors. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> [ Tested and Verified by Chandra Seetharaman ] Acked-by: Chandra Seetharaman <sekharan@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 24 August 2007, 23:10:39 UTC |
| 9f3119b | Zhao Yakui | 24 August 2007, 08:18:16 UTC | ACPI: Validate XSDT, use RSDT if XSDT fails ACPI 1.0 used an RSDT with 32-bit physical addresses. ACPI 2.0 adds an XSDT with 32-bit physical addresses. An ACPI 2.0 aware OS is supposed to use the XSDT (when present) instead of the RSDT. However, several systems have failed because the XSDT contains NULL entries -- while it is missing pointers to needed tables, such as SSDTs. When we find an XSDT with NULL entries, discard it and use the ACPI 1.0 RSDT instead. http://bugzilla.kernel.org/show_bug.cgi?id=8630 Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 22:46:25 UTC |
| 2db9ccb | Pavel Machek | 24 August 2007, 09:45:50 UTC | ACPI: /proc/acpi/thermal_zone trip points are now read-only, mark them as such Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 22:02:13 UTC |
| 095e56c | Ingo Molnar | 24 August 2007, 18:39:10 UTC | sched: fix startup penalty calculation fix task startup penalty miscalculation: sysctl_sched_granularity is unsigned int and wait_runtime is long so we first have to convert it to long before turning it negative ... Signed-off-by: Ingo Molnar <mingo@elte.hu> | 24 August 2007, 18:39:10 UTC |
| ea0aa3b | Peter Zijlstra | 24 August 2007, 18:39:10 UTC | sched: simplify bonus calculation #2 current code: delta = calc_delta_mine(delta_exec, curr->load.weight, lw); delta = min((u64)delta, cfs_rq->sleeper_bonus); Notice that this calc_delta_mine() line is exactly delta_mine, which gives: delta = min((u64)delta_mine, cfs_rq->sleeper_bonus); Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu> | 24 August 2007, 18:39:10 UTC |
| a6f2994 | Peter Zijlstra | 24 August 2007, 18:39:10 UTC | sched: simplify bonus calculation #1 current code: delta = min(cfs_rq->sleeper_bonus, (u64)delta_exec); delta = calc_delta_mine(delta, curr->load.weight, lw); delta = min((u64)delta, cfs_rq->sleeper_bonus); drop the first min(), because we clip against sleeper_bonus in the 3rd line again. That gives: delta = calc_delta_mine(delta_exec, curr->load.weight, lw); delta = min((u64)delta, cfs_rq->sleeper_bonus); Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu> | 24 August 2007, 18:39:10 UTC |
| b2133c8 | Ingo Molnar | 24 August 2007, 18:39:10 UTC | sched: tidy up and simplify the bonus balance make the bonus balance more consistent: do not hand out a bonus if there's too much in flight already, and only deduct as much from a runner as it has the capacity. This makes the bonus engine a zero-sum game (as intended). this also simplifies the code: text data bss dec hex filename 34770 2998 24 37792 93a0 sched.o.before 34749 2998 24 37771 938b sched.o.after and it also avoids overscheduling in sleep-happy workloads like hackbench.c. Signed-off-by: Ingo Molnar <mingo@elte.hu> | 24 August 2007, 18:39:10 UTC |
| 98fbc79 | Dmitry Adamushko | 24 August 2007, 18:39:10 UTC | sched: optimize task_tick_rt() a bit Mitchell Erblich suggested a quality-of-implementation change to not requeue SCHED_RR tasks if there's only a single task on the runqueue, by checking for rq->nr_running == 1. provide a more efficient implementation of that, to check that particular RT priority-queue only. [ From: mingo@elte.hu ] Also first requeue the task then set need_resched - results in slightly better machine-instruction ordering. Also clean up the code a bit. Signed-off-by: Dmitry Adamushko <dmitry.adamushko@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> | 24 August 2007, 18:39:10 UTC |
| deac4ee | Sven-Thorsten Dietrich | 24 August 2007, 18:39:10 UTC | sched: simplify can_migrate_task() Remove trivial conditional branch in Linux scheduler's can_migrate_task() function. text data bss dec hex filename 34770 2998 24 37792 93a0 sched.o.before 34757 2998 24 37779 9393 sched.o.after Signed-off-by: Sven-Thorsten Dietrich <sven@thebigcorporation.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> | 24 August 2007, 18:39:10 UTC |
| 71fd371 | Ingo Molnar | 24 August 2007, 18:39:10 UTC | sched: remove HZ dependency from the granularity default remove HZ dependency from the granularity default. Use 10 msec for the base granularity, 1 msec for wakeup granularity and 25 msec for batch wakeup granularity. (These defaults are close to the values that the default HZ=250 setting got previously, and thus it's the most common setting.) Signed-off-by: Ingo Molnar <mingo@elte.hu> | 24 August 2007, 18:39:10 UTC |
| 7c6c16f | Bruce Ashfield | 24 August 2007, 18:39:10 UTC | sched: CONFIG_SCHED_GROUP_FAIR=y fixlet when I built with CONFIG_FAIR_GROUP_SCHED=y, I need the following change to make things right. [ From: mingo@elte.hu ] this config option is not upstream-configurable right now but lets fix this for completeness. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> | 24 August 2007, 18:39:10 UTC |
| 3e069ee | Len Brown | 24 August 2007, 07:06:33 UTC | ACPI: fix ia64 allnoconfig build drivers/acpi/event.c:238: error: conflicting types for ‘acpi_bus_generate_netlink_event’ include/acpi/acpi_bus.h:324: error: previous declaration of ‘acpi_bus_generate_netlink_event’ was here Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 07:06:33 UTC |
| b173491 | Bjorn Helgaas | 15 August 2007, 16:32:13 UTC | PNP: remove null pointer checks Remove some null pointer checks. Null pointers in these areas indicate programming errors, and I think it's better to oops immediately rather than return an error that is easily ignored. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-by: Adam Belay <abelay@novell.com> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 05:27:24 UTC |
| 4f0217e | Bjorn Helgaas | 15 August 2007, 16:32:12 UTC | PNP: remove MODULE infrastructure We don't support building any part of PNP as a module (*drivers* can be modules, of course, but the PNP infrastructure itself can not). Since MODULE will never be defined, remove the ifdefs and dead code. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-by: Adam Belay <abelay@novell.com> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 05:27:24 UTC |
| 6c504d3 | Bjorn Helgaas | 15 August 2007, 16:32:11 UTC | ISAPNP: removed unused isapnp_detected and ISAPNP_DEBUG ISAPNP_DEBUG isn't used at all. isapnp_detected is set but never read. So remove them both. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-by: Adam Belay <abelay@novell.com> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 05:27:24 UTC |
| 4721a4c | Bjorn Helgaas | 15 August 2007, 16:32:10 UTC | PNPACPI: remove unnecessary casts of "void *" Remove unnecessary casts of void pointers. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-by: Adam Belay <abelay@novell.com> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 05:27:24 UTC |
| 4cec086 | Bjorn Helgaas | 15 August 2007, 16:32:09 UTC | PNPACPI: simplify irq_flags() No need for a temporary variable; just return the flags once we know them. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-by: Adam Belay <abelay@novell.com> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 05:27:23 UTC |
| 1e0aa9a | Bjorn Helgaas | 15 August 2007, 16:32:08 UTC | PNP: fix up after Lindent More manual fixups after Lindent. No functional change. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-by: Adam Belay <abelay@novell.com> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 05:27:23 UTC |
| 79d2dfa | Thomas Renninger | 24 August 2007, 05:24:47 UTC | ACPI: enable GPEs before calling _WAK on resume It seems it's required to enable GPEs before _WAK. E.g. X60 triggers a LID related GPE instead of doing a Notify in WAK. Now the GPE reaches the kernel and the Notify for LID status change gets thrown from there. Signed-off-by: Thomas Renninger <trenn@suse.de> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 05:24:47 UTC |
| e1996a6 | Guillaume Chazarain | 16 August 2007, 16:18:53 UTC | asus-laptop: Fix rmmod of asus_laptop The asus laptop driver conditionnaly registers leds in asus_led_register() depending on their availability, but unconditionnaly unregisters them all at exit time or when the module fails to load. Unregistering not registered leds result in the following Oops. So we should check before unregistering. [<c032d2f9>] do_page_fault+0x511/0x5e9 [<c032bae2>] error_code+0x6a/0x70 [<c026abf8>] device_unregister+0x26/0x32 [<f8864218>] led_classdev_unregister+0x58/0x94 [led_class] [<f88a90f8>] asus_led_exit+0x17/0x41 [asus_laptop] [<f88a91c9>] asus_laptop_exit+0xd/0x3f [asus_laptop] [<c013cee1>] sys_delete_module+0x17b/0x1a2 [<c0106eae>] sysenter_past_esp+0x6b/0xa1 EIP: [<c026a9a3>] device_del+0xb/0x23a SS:ESP 0068:f594ef0c Signed-off-by: Guillaume Chazarain <guichaz@yahoo.fr> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 05:07:30 UTC |
| 015a916 | Mattia Dongili | 12 August 2007, 07:20:27 UTC | sony-laptop: call sonypi_compat_init earlier sonypi_compat uses a kfifo that needs to be present before _SRS is called to be able to cope with the IRQs triggered when setting resources. Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 04:57:20 UTC |
| f46d160 | Mattia Dongili | 12 August 2007, 07:20:26 UTC | sony-laptop: enable Vaio FZ events Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com> | 24 August 2007, 04:56:59 UTC |
| 1a8f461 | Linus Torvalds | 24 August 2007, 04:40:33 UTC | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: don't check n_sectors during revalidation if zero pata_via: Add Arima W730-K8 and other rebadgings pata_sis: Add the FSC Amilo and friends pata_pdc2027x: PLL detection fixes libata: fix n_sectors failure handling during revalidation | 24 August 2007, 04:40:33 UTC |
| b1b8aca | Linus Torvalds | 24 August 2007, 04:40:07 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23: sh: missing symbol fix for sh4-202 sh: Fix DSP opcode regression for SH3-DSP parts. | 24 August 2007, 04:40:07 UTC |
| abcb1ff | Jesper Juhl | 24 August 2007, 00:28:42 UTC | tty: dont needlessly cast kmalloc() return value kmalloc() hands us a void pointer, we don't need to cast it. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 24 August 2007, 04:39:41 UTC |
| 87bd1e9 | Linus Torvalds | 24 August 2007, 04:38:54 UTC | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (6070): Fix a warning at dvb_net V4L/DVB (6042): b2c2-flexcop: fix Airstar HD5000 tuning regression | 24 August 2007, 04:38:54 UTC |
| d0797b3 | Linus Torvalds | 24 August 2007, 04:38:39 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: tweak the sched_runtime_limit tunable sched: skip updating rq's next_balance under null SD sched: fix broken SMT/MC optimizations sched: accounting regression since rc1 sched: fix sysctl directory permissions sched: sched_clock_idle_[sleep|wakeup]_event() | 24 August 2007, 04:38:39 UTC |
| 0542170 | Linus Torvalds | 24 August 2007, 04:38:21 UTC | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: fix bad error path in conversion routines 9p: remove deprecated v9fs_fid_lookup_remove() 9p: update maintainers and documentation 9p: fix use after free | 24 August 2007, 04:38:21 UTC |
| 6dc2c1b | Miloslav Trmac | 23 August 2007, 09:19:53 UTC | Renumber AUDIT_TTY_[GS]ET Renumber AUDIT_TTY_[GS]ET to avoid a conflict with netlink message types already used in the wild. Signed-off-by: Miloslav Trmac <mitr@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 24 August 2007, 04:37:45 UTC |
| 1ff6f3d | Linus Torvalds | 24 August 2007, 04:36:13 UTC | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: sdhci: tell which spurious interrupt we got sdhci: handle data interrupts during command mmc: ignore bad max block size in sdhci sdhci: be more cautious about block count register drivers/mmc/core/host.c: kmalloc + memset conversion to kzalloc drivers/mmc/core/bus.c: kmalloc + memset conversion to kzalloc | 24 August 2007, 04:36:13 UTC |
| 2b56fec | Linus Torvalds | 24 August 2007, 04:35:45 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: PCI: Run k8t_sound_hostbridge quirk only when needed PCI: disable MSI on RX790 PCI: disable MSI on RD580 PCI: disable MSI on RS690 PCI: make pcie_get_readrq visible in pci.h PCI: lets kill the 'PCI hidden behind bridge' message pci/hotplug/cpqphp_ctrl.c: remove stale BKL use PCI: Document pci_iomap() PCI: quirk_e100_interrupt() called too early PCI: Move prototypes for pci_bus_find_capability to include/linux/pci.h | 24 August 2007, 04:35:45 UTC |
| 9e1a3e3 | Linus Torvalds | 24 August 2007, 04:35:04 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (35 commits) usb: add PRODUCT, TYPE to usb-interface events USB: resubmission unusual_devs modification for Nikon D80 usb quirks: Add Canon EOS 5D (PC Connection mode) to the autosuspend blacklist USB: make EHCI initialize properly on PPC SOCs UEAGLE: Remove sysfs files on error case USB: fsl_usb2_udc: fix bug in processing setup requests USB: g_file_storage: fix bug in DMA buffer handling USB: update last_busy field correctly USB: fix DoS in pwc USB video driver USB: allow retry on descriptor fetch errors USB: unkill cxacru atm driver USB: Adding support for HTC Smartphones to ipaq USB: another quirky device USB: quirky mass storage device USB: ohci, fix oddball gcc warning usb-storage: fix bugs in the disconnect pathway usb: typo in usb R8A66597 HCD config USB: accept 1-byte Device Status replies, fixing some b0rken devices USB: blacklist Samsung ML-2010 printer usb-serial: fix oti6858.c segfault in termios handling ... | 24 August 2007, 04:35:04 UTC |
| de80af4 | Linus Torvalds | 24 August 2007, 04:34:43 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: sysfs: don't warn on removal of a nonexistent binary file HOWTO: latest lxr url address changed HOWTO: korean translation of Documentation/HOWTO Fix Off-by-one in /sys/module/*/refcnt sysfs: fix locking in sysfs_lookup() and sysfs_rename_dir() | 24 August 2007, 04:34:43 UTC |
| 405d296 | Greg Ungerer | 23 August 2007, 23:26:12 UTC | m68knommu: include linux/fs.h for do_pipe() Include linux/fs.h to get the prototype for do_pipe(). Build fix. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 24 August 2007, 04:32:54 UTC |
| 01740fc | Greg Ungerer | 23 August 2007, 23:25:59 UTC | m68knommu: include asm-generic/pgtable.h Include asm-generic/pgtable.h to pick up the lazy_mmu_mode and lazy_cpu_mode macros. Won't build without them. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 24 August 2007, 04:32:54 UTC |
