commit c9927c2bf4f45bb85e8b502ab3fb79ad6483c244 Author: Linus Torvalds Date: Tue Oct 23 20:50:57 2007 -0700 Linux 2.6.24-rc1 The patch is big. Really big. You just won't believe how vastly hugely mindbogglingly big it is. I mean you may think it's a long way down the road to the chemist, but that's just peanuts to how big the patch from 2.6.23 is. But it's all good. Signed-off-by: Linus Torvalds commit f0c15f48bb4a68d5f74855720ae5efc56dec6a3b Author: Greg Ungerer Date: Wed Oct 24 12:03:52 2007 +1000 add port definition for mcf UART driver Add a port type definition for the Freescale UART driver ports (mcf.c). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit ee5a2402a1572fcaf6b674d0892cd03fdcbc70a9 Author: Greg Ungerer Date: Wed Oct 24 12:04:13 2007 +1000 m68knommu: remove unused machdep variable definitions Remove old definitions of the timer function pointers. Add definitions of the common hardware timer functions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit ee8c8ada2912641a906c978b9d635a7335c094b0 Author: Greg Ungerer Date: Wed Oct 24 12:04:08 2007 +1000 m68knommu: define DMA channels for ColdFire 532x Create definition for DMA channels on the ColdFire 532x family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 99dc736fb3c7462597adaf72cd801b52c6c4ced1 Author: Greg Ungerer Date: Wed Oct 24 12:03:56 2007 +1000 m68knommu: add platform struct for ColdFire UART driver Add platform support structure for use with new ColdFire UART driver. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit f386c3ccf65c24e5b0711f6ec63872775555a6d3 Author: Greg Ungerer Date: Wed Oct 24 12:03:46 2007 +1000 m68knommu: mark mem init functions as __init Mark the m68knommu memory init functions as __init. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 1d2842e05a63cbca10a301632598a5193ad8980b Author: Greg Ungerer Date: Wed Oct 24 12:03:41 2007 +1000 m68knommu: mark setup_arch() as __init Mark the m68knommu setup_arch() function as __init. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 65fde4c6dfd27665b13336d7dfc47daa7fa960cb Author: Greg Ungerer Date: Wed Oct 24 12:03:32 2007 +1000 m68knommu: cleanup 68VZ328 init code Removed header includes not needed. Remove use of old m68knommu timer function pointers. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit f1353707b79cb863a7f081c77067db6280e8ce64 Author: Greg Ungerer Date: Wed Oct 24 12:03:28 2007 +1000 m68knommu: cleanup 68EZ328 init code Clean up 68EZ328 timer support code. Removed header includes not needed. Remove use of old m68knommu timer function pointers. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7e6a3d402c97c95ca1f8dc84ad5b69f3118cd2b5 Author: Greg Ungerer Date: Wed Oct 24 12:03:25 2007 +1000 m68knommu: cleanup 68360 startup code Clean up 68360 timer support code. Removed header includes not needed. Remove use of old m68knommu timer function pointers. Use common function naming for 68328 timer functions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 846757162d3f92629b3ab6189366cd8febbb4995 Author: Greg Ungerer Date: Wed Oct 24 12:03:20 2007 +1000 m68knommu: cleanup 68328 timer code Use common function naming for 68328 timer functions to make them consistent with the various other hardware m68knommu timers. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0e298ebec4ddc84741340fb085887ad8732f727b Author: Greg Ungerer Date: Wed Oct 24 12:03:16 2007 +1000 m68knommu: cleanup 68328 init code Clean up 68328 timer support code. Removed header includes not needed. Remove use of old m68knommu timer function pointers. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 33d56bc4bf3efc0ecb07c95003cb7869f79f3999 Author: Greg Ungerer Date: Wed Oct 24 12:03:10 2007 +1000 m68knommu: remove unused variables in setup.c Remove unused variables from setup.c code. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit e0f13920d6a082d85e21a1b4c02907446198fc36 Author: Jeff Garzik Date: Tue Oct 23 18:36:43 2007 -0400 ni5010: kill unused variable Signed-off-by: Jeff Garzik commit 0e6f7329d594174f177e5990d24e141954101a1c Author: Jeff Garzik Date: Tue Oct 23 18:36:42 2007 -0400 eexpress: fix !SMP unused-var warning Signed-off-by: Jeff Garzik commit 3bdf590eac36ac5930deb9552febee3ff18cd2d1 Author: Jeff Garzik Date: Tue Oct 23 18:36:44 2007 -0400 cgroup: kill unused variable Signed-off-by: Jeff Garzik commit 3a9e3a51dd47bd9e2fd6bcf3c893eb5729c6f1ee Author: Tejun Heo Date: Tue Oct 23 15:27:31 2007 +0900 jmicron: update quirk for JMB361/3/5/6 Set bits 0, 4, 5 and 7 of PCI configuration register 0x40 in the quirk. This has the following effects and is recommended by the vendor. * Force enable of IDE channels (used to be left alone as BIOS configured) * Change initial phase behavior of PIO cycle such that the host pulls down the bus instead of tristating it. Vendor recommends this setting. The above settings are better for the current generation of controllers and needed for the upcoming next generation. Tested on JMB363. Signed-off-by: Tejun Heo Cc: Ethan Hsiao Signed-off-by: Jeff Garzik commit 0c173174d0e8267b1100442f4df119ab6d52821c Author: Tejun Heo Date: Tue Oct 23 19:07:49 2007 +0900 libata: add HTS542525K9SA00 to NCQ blacklist Another one doing spurious NCQ completions. Blacklist it. Signed-off-by: Tejun Heo Cc: Luca Tettamanti Signed-off-by: Jeff Garzik commit 150981b0306fc5773b929e31ab5b0590c87cc77c Author: Alan Cox Date: Tue Oct 23 16:50:02 2007 +0100 libata-core: auditting chk_status v check_status Did a complete audit of these and found we have another error case. ata_bus_softreset calls ata_check_status which means that it tries to do an ioread8 on the port blindly and check versus 0xFF for an error. It should of course be using the ap->ops method for this via chk_status, and this bug causes a wrog status call on the NS87415 at least. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 2dcb407e61458ded17503d6bd12b8c064965368b Author: Jeff Garzik Date: Fri Oct 19 06:42:56 2007 -0400 [libata] checkpatch-inspired cleanups Tackle the relatively sane complaints of checkpatch --file. The vast majority is indentation and whitespace changes, the rest are * #include fixes * printk KERN_xxx prefix addition * BSS/initializer cleanups Signed-off-by: Jeff Garzik commit 2c800093c7375e358f28eeb132512eb57b6389e3 Author: Jeff Garzik Date: Tue Oct 23 20:56:59 2007 -0400 Remove Andrew Morton from list of net driver maintainers. He now rules the world, not just this tiny tract of land. Signed-off-by: Jeff Garzik Acked-by: Andrew Morton commit d0e81b7e2246a41d068ecaf15aac9de570816d63 Author: Jay Vosburgh Date: Wed Oct 17 17:37:51 2007 -0700 bonding: Acquire correct locks in alb for promisc change Update ALB mode monitor to hold correct locks (RTNL and nothing else) when calling dev_set_promiscuity. Signed-off-by: Andy Gospodarek Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 6603a6f25e4bca922a7dfbf0bf03072d98850176 Author: Jay Vosburgh Date: Wed Oct 17 17:37:50 2007 -0700 bonding: Convert more locks to _bh, acquire rtnl, for new locking Convert more lock acquisitions to _bh flavor to avoid deadlock with workqueue activity and add acquisition of RTNL in appropriate places. Affects ALB mode, as well as core bonding functions and sysfs. Signed-off-by: Andy Gospodarek Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 059fe7a578fba5bbb0fdc0365bfcf6218fa25eb0 Author: Jay Vosburgh Date: Wed Oct 17 17:37:49 2007 -0700 bonding: Convert locks to _bh, rework alb locking for new locking Convert locking-related activity to new & improved system. Convert some lock acquisitions to _bh and rework parts of ALB mode, both to avoid deadlocks with workqueue activity. Signed-off-by: Andy Gospodarek Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 0b0eef66419e9abe6fd62bc958ab7cd0a18f858e Author: Jay Vosburgh Date: Wed Oct 17 17:37:48 2007 -0700 bonding: Convert miimon to new locking Convert mii (link state) monitor to acquire correct locks for failover events. In particular, failovers generally require RTNL at a low level (when manipulating device MAC addresses, for example) and no other locks. The high level monitor is responsible for acquiring a known set of locks, RTNL, the bond->lock for read and the slave_lock for write, and the low level failover processing can then release appropriate locks as needed. This patch provides the high level portion. As it is undesirable to acquire RTNL for every monitor pass (which may occur as often as every 10 ms), the miimon has been converted to do conditional locking. A first pass inspects all slaves to determine if any action is required, and if so, a second pass (after acquring RTNL) is done to perform any actions (doing a complete rescan, as the situation may have changed when all locks were released). Signed-off-by: Andy Gospodarek Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit cf5f9044934658dd3ffc628a60cd37c70f8168b1 Author: Jay Vosburgh Date: Wed Oct 17 17:37:47 2007 -0700 bonding: Convert balance-rr transmit to new locking Change locking in balance-rr transmit processing to use a free running counter to determine which slave to transmit on. Instead, a free-running counter is maintained, and modulo arithmetic used to select a slave for transmit. This removes lock operations from the TX path, and eliminates a deadlock introduced by the conversion to work queues. Signed-off-by: Andy Gospodarek Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 1b76b31693d4a6088dec104ff6a6ead54081a3c2 Author: Jay Vosburgh Date: Wed Oct 17 17:37:45 2007 -0700 Convert bonding timers to workqueues Convert bonding timers to workqueues. This converts the various monitor functions to run in periodic work queues instead of timers. This patch introduces the framework and convers the calls, but does not resolve various locking issues, and does not stand alone. Signed-off-by: Andy Gospodarek Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 15df5806c6fc94e607632bba70328194905e988f Author: Jeff Garzik Date: Tue Oct 23 20:22:12 2007 -0400 Update MAINTAINERS to reflect my (jgarzik's) current efforts. Remove net driver entries (they fall under the more general 'net driver maintainer') umbrella. Remove entries for older drivers that either no longer exist, are about to be removed, or I no longer care about. Signed-off-by: Jeff Garzik commit de0523863e167ec29cbd247bd004cdcb607e330e Author: Olof Johansson Date: Sat Oct 20 14:10:03 2007 -0500 pasemi_mac: fix typo Add missing &: drivers/net/pasemi_mac.c: In function 'pasemi_mac_clean_rx': drivers/net/pasemi_mac.c:553: warning: passing argument 1 of 'prefetch' makes pointer from integer without a cast Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit 79d1050813d4950335f1097a971836ed08be53b0 Author: Maciej W. Rozycki Date: Mon Oct 22 18:13:24 2007 +0100 defxx.c: dfx_bus_init() is __devexit not __devinit The dfx_bus_uninit() call is called from dfx_unregister() which is __devexit and which is ultimately the ->remove call for the device. Signed-off-by: Maciej W. Rozycki Signed-off-by: Jeff Garzik commit b9192ad93033e98bf50d9ee8489b24c2d9936f8c Author: Ursula Braun Date: Mon Oct 22 16:16:15 2007 +0200 s390 MAINTAINERS adding Frank Blaschka to s390 networking maintainers Signed-off-by: Frank Blaschka Signed-off-by: Ursula Braun Signed-off-by: Jeff Garzik commit f1ecfd5d3b69d98b814435758c485e6fd0e112de Author: Ursula Braun Date: Mon Oct 22 16:16:14 2007 +0200 remove header_ops bug in qeth driver Remove qeth bug caused by commit: [NET]: Move hardware header operations out of netdevice. This is the second part of the qeth header_ops patch, since first patch sent 10/19 has been insufficient. Nevertheless first patch is still valid and should be kept. Signed-off-by: Ursula Braun Signed-off-by: Jeff Garzik commit b877fe288a325b9711d83628eb54e1deb63f962e Author: Stephen Hemminger Date: Mon Oct 22 13:39:09 2007 -0700 sky2: crash on remove Fix off-by one in remove logic that just got introduced. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit f5e42fbab6c6ca39a33410a0ed0037589908c264 Author: Ralf Baechle Date: Tue Oct 23 00:35:26 2007 +0100 MIPSnet: Delete all the useless debugging printks. Plus minor formatting fixes. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 6cd043d99dcf5d252fcc682958541f449113f7b3 Author: Matteo Croce Date: Tue Oct 23 19:12:22 2007 +0200 AR7 ethernet: small post-merge cleanups and fixes Signed-off-by: Matteo Croce Signed-off-by: Eugene Konev Signed-off-by: Felix Fietkau Signed-off-by: Jeff Garzik commit 7c2399756ab8ccb2c57da4630b4aa4a1d61b3846 Author: Jeff Garzik Date: Fri Oct 19 03:12:20 2007 -0400 [SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriate Rather than hand-rolling our own prototype, make the code more future-proof by using the standard irq_handler_t typedef. Signed-off-by: Jeff Garzik commit f07ef395ad4cd050e695edfec217ceb2158220a3 Author: Jeff Garzik Date: Tue Oct 23 19:12:11 2007 -0400 drivers/char/riscom8: clean up irq handling Make irq handling more efficient, by passing board pointer via request_irq() to our irq handler's dev_id argument. This eliminates a table lookup upon each interrupt, and eliminates an associated global variable (the table). Signed-off-by: Jeff Garzik commit 080eb42f31a8a6dde1568f906692d9914cdfbfe8 Author: Jeff Garzik Date: Fri Oct 19 19:31:27 2007 -0400 isdn/sc: irq handler clean * pass card number to irq handler * use card number in irq handler to avoid looping through each adapter Signed-off-by: Jeff Garzik commit 246f93f5cc0d4116cadf33ad1c8ae7ac08e9b1c7 Author: Jeff Garzik Date: Fri Oct 19 19:30:28 2007 -0400 isdn/act2000: fix major bug. clean irq handler. * invert sense of request_irq() test. otherwise we will always fail, when IRQ is available. * no need to use 'irq' function arg, its stored in a data struct already Signed-off-by: Jeff Garzik commit d12341f9f2b7cc38c699c2af3a9f17eb39b64b17 Author: Jeff Garzik Date: Fri Oct 19 15:45:35 2007 -0400 char/pcmcia/synclink_cs: trim trailing whitespace Signed-off-by: Jeff Garzik commit 6bd3bd6794d4139aa1b5193a82e3adfcb488c392 Author: Jeff Garzik Date: Fri Oct 19 15:38:40 2007 -0400 drivers/char/ip2: separate polling and irq-driven work entry points Polling currently calls the irq handler, which loops through all the boards, calling the work function for all polling boards with work. irq handling loops through all the boards, finding the specific board that applies to us, and calling the work just for that one board. The two logics are sufficiently different to warrant different functions, rather than being slack and calling the same function in two different ways. This serves to make the interrupt handler a -lot- more efficient. Signed-off-by: Jeff Garzik commit f3518e4ee70916e6bd43c8082e02f0dd1e19d7af Author: Jeff Garzik Date: Fri Oct 19 15:24:59 2007 -0400 drivers/char/ip2: split out irq core logic into separate function No changes besides code movement and glue. Signed-off-by: Jeff Garzik commit 1daec86ad11383845274e032d1b90620258dc87d Author: Jeff Garzik Date: Fri Oct 19 03:14:03 2007 -0400 [NETDRVR] lib82596, netxen: delete pointless tests from irq handler Remove always-false tests in irq handler. Also a few other minor cleanups. Signed-off-by: Jeff Garzik commit 06efcad0d43a5491602f7d7bfc1ce997cdb0d062 Author: Jeff Garzik Date: Fri Oct 19 03:10:11 2007 -0400 Eliminate pointless casts from void* in a few driver irq handlers. Signed-off-by: Jeff Garzik commit 5712cb3d81566893c3b14e24075cf48ec5c35d00 Author: Jeff Garzik Date: Fri Oct 19 02:54:26 2007 -0400 [PARPORT] Remove unused 'irq' argument from parport irq functions None of the drivers with a struct pardevice's ->irq_func() hook ever used the 'irq' argument passed to it, so remove it. Signed-off-by: Jeff Garzik commit f230d1010ad0dcd71d9ca8ea6864afac49c5aa9b Author: Jeff Garzik Date: Fri Oct 19 01:56:02 2007 -0400 [PARPORT] Kill useful 'irq' arg from parport_{generic_irq,ieee1284_interrupt} parport_ieee1284_interrupt() was not using its first arg at all. Delete. parport_generic_irq()'s second arg makes its first arg completely redundant. Delete, and use port->irq in the one place where we actually need it. Also, s/__inline__/inline/ to make the code look nicer. Signed-off-by: Jeff Garzik commit 3f2e40df0e1d7694224c3083b0bebd129039a40a Author: Jeff Garzik Date: Fri Oct 19 01:42:14 2007 -0400 [PARPORT] Consolidate code copies into a single generic irq handler Several arches used the exact same code for their parport irq handling. Make that code generic, in parport_irq_handler(). Also, s/__inline__/inline/ in include/linux/parport.h. Signed-off-by: Jeff Garzik commit 432409eebcdec38ff6fa949f097b5438d588faa5 Author: Neil Brown Date: Tue Oct 23 17:09:13 2007 -0400 NFS: Fix for bug in handling of errors for O_DIRECT writes Commit eda3cef8dd2b83875affe82595db9d0c278879b2 ("NFS: Fix error handling in nfs_direct_write_result()") ensured that if a WRITE returns an error, then data->res.verf->committed is not tested (as it is not initialised). Then commit 60fa3f769f7651a60125a0f44e3ffe3246d7cf39 ("NFS: Fix two bugs in the O_DIRECT write code") inadvertently reverted this while fixing other problems. So move the test so that we never examine ->committed in an error case, and fix a speeling error while we are there. Cc: Chuck Lever Signed-off-by: Neil Brown Acked-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 1b82ba6e47c13ee369a4808f72d003499f8c7920 Author: Carlos Corbacho Date: Fri Oct 19 19:34:15 2007 +0100 x86: Add HPET force support for MCP55 (nForce 5) chipsets Add support to force_hpet for all known MCP55 (nForce 5) chipset LPC bridges. These are the untested nForce 5 chips (taken from Mikko's original patch, and checked against pci.ids). Signed-off-by: Carlos Corbacho Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar arch/x86/kernel/quirks.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit d79a5f80dc1153d3f637dfcf3808066414fbb51a Author: Carlos Corbacho Date: Fri Oct 19 18:51:27 2007 +0100 x86: Force enable HPET for CK804 (nForce 4) chipsets This patch adds a quirk from LinuxBIOS to force enable HPET on the nVidia CK804 (nForce 4) chipset. This quirk can very likely support more than just nForce 4 (LinuxBIOS use the same code for nForce 5), and possibly nForce 3, but I don't have those chipsets, so cannot add and test them. Tested on an Abit KN9 (CK804). Signed-off-by: Carlos Corbacho Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Documentation/kernel-parameters.txt | 3 +- arch/x86/kernel/quirks.c | 37 +++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) commit fa76dab935b856871024530ec818bc0a8f88a016 Author: H. Peter Anvin Date: Tue Oct 23 22:37:25 2007 +0200 x86: clean up setup.h and the boot code Make usable by the boot code. Clean up vestiges of the old command-line protocol from setup.h and head_32.S (it is still supported from the boot loader point of view, since it is converted to the new command-line protocol by the boot code.) Signed-off-by: H. Peter Anvin Signed-off-by: Thomas Gleixner commit 0de80bcc2baed116a569c38cbc38c5dcb945d14d Author: Rafael J. Wysocki Date: Tue Oct 23 22:37:24 2007 +0200 x86: Save registers in saved_context during suspend and hibernation During hibernation and suspend on x86_64 save CPU registers in the saved_context structure rather than in a handful of separate variables. Signed-off-by: Rafael J. Wysocki Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit ef685298b4b3dead1efa1d47cd27ced0f2673254 Author: Thomas Gleixner Date: Tue Oct 23 22:37:24 2007 +0200 x86: merge setup_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 33185c504f8e521b398536b5a8d415779a24593c Author: Thomas Gleixner Date: Tue Oct 23 22:37:24 2007 +0200 x86: merge signal_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 23e5305d93801fca4ff2ff4b94bdf49e24c96a5e Author: Brian Gerst Date: Sat Oct 20 13:41:41 2007 -0400 x86: merge required-features.h Signed-off-by: Brian Gerst commit 77129c5e3ddba94b6ab7223504b39956f653f376 Author: Thomas Gleixner Date: Tue Oct 23 22:37:24 2007 +0200 x86: merge sigcontext_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit be7baf80a699644850ff27c2105c171177ece4ea Author: Thomas Gleixner Date: Tue Oct 23 22:37:24 2007 +0200 x86: merge msr_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 297a99e1a377f68e5c5bfef8eeafbd115f9fc2fa Author: Thomas Gleixner Date: Tue Oct 23 22:37:24 2007 +0200 x86: merge mttr_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit d5f1354183573af3f908c71c5323ae800dd1e591 Author: Thomas Gleixner Date: Tue Oct 23 22:37:24 2007 +0200 x86: merge statfs_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 79c74977045a3f1f5eeb45241198fa3d6970c85f Author: Thomas Gleixner Date: Tue Oct 23 22:37:24 2007 +0200 x86: merge stat_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 079091a450ed5a0001c2ee9dadd8ddaceddb91b5 Author: Thomas Gleixner Date: Tue Oct 23 22:37:24 2007 +0200 x86: merge shmbuf_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 8fc37f2c474b8ea61186fd77193324845432447b Author: Thomas Gleixner Date: Tue Oct 23 22:37:24 2007 +0200 x86: merge ptrace_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 5ca3b0f1958a9f96b7d596e54145722e8d4631b9 Author: Thomas Gleixner Date: Tue Oct 23 22:37:24 2007 +0200 x86: merge msgbuf_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 2439a791977a85bea2a11736c8c7ea2e25c49597 Author: Thomas Gleixner Date: Tue Oct 23 22:37:23 2007 +0200 x86: merge elf_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit acbbbe9f5ab52da90a8edec02ec973e7f44dae81 Author: Thomas Gleixner Date: Tue Oct 23 22:37:23 2007 +0200 x86: merge byteorder_32/64.h Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit d88203d1ab225f208c3f70cf21b025f427245c79 Author: Thomas Gleixner Date: Tue Oct 23 22:37:23 2007 +0200 x86: whitespace cleanup of mce_64.c Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 01e11182e73eb36af1cc7f3b023d25aa62fd3a8d Author: Thomas Gleixner Date: Tue Oct 23 22:37:23 2007 +0200 x86: consolidate the cpu/ related code usage The x86_64 arch/x86/kernel/Makefile uses references into arch/x86/kernel/cpu/... to use code from there. Unifiy it with the nicely structured i386 way and reuse the existing subdirectory make rules. Also move the machine check related source into ...kernel/cpu/mcheck, where the other machine check related code is. No code change. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 3bc258ad87e5b0bbbca247b24ce8fac380c7d86b Author: Thomas Gleixner Date: Tue Oct 23 22:37:23 2007 +0200 x86: prepare consolidation of cpu/ related code usage Move mce.c to mce_32.c to allow the later move of the x86_64 mce.c from arch/x86/kernel/ to ...kernel/cpu/mcheck No code change. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 34d19e29c9402b6149c128517f73e7773d5838bf Author: Thomas Gleixner Date: Tue Oct 23 22:37:23 2007 +0200 x86: prepare consolidation of cpu/ related Makefiles Prepare the makefiles in x86/kernel/cpu and x86/kernel/cpu/mcheck to be used by the x86_64 build as well. No code change. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 5e4181b31366ea13b7b81ce3b0041f5710cc8b65 Author: Thomas Gleixner Date: Tue Oct 23 22:37:23 2007 +0200 x86: Unify arch/x86/kernel/acpi Makefiles Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 9b58aebc73095c045826d891f8e8de6d5bd48c12 Author: Thomas Gleixner Date: Tue Oct 23 22:37:23 2007 +0200 x86: merge arch/x86/crypto Makefiles Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit bec2c48c2045ca467d07bba54783318b8672bda7 Author: Thomas Gleixner Date: Tue Oct 23 22:37:23 2007 +0200 x86: Add BITS to allow simple Makefile sharing Preperatory patch to simplify the sharing of Makefiles in arch/x86. Linus came up with this during a discussion about the ugliness of ifeq($CONFIG_X86_32),y) and obj-$(CONFIG_X86_32) in the shared Makefiles. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 428c5a2339f6d59e3b2d59e9b878b95e6f7a09d7 Author: Chris Snook Date: Sat Oct 20 07:51:29 2007 -0400 x86: unify div64{,_32,_64}.h Unify x86 div64.h headers. Signed-off-by: Chris Snook Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 01005e74e55f3336fa0d4111f4f0aab0a0e57c70 Author: Chris Snook Date: Sat Oct 20 06:37:01 2007 -0400 x86: unify a.out{,_32,_64}.h Unify x86 a.out_32.h and a.out_64.h [ tglx: Kbuild fixup ] Signed-off-by: Chris Snook Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 62a31a03b3d2a9d20e7a073e2cd9b27bfb7d6a3f Author: Hiroshi Shimamoto Date: Fri Oct 19 18:24:20 2007 -0700 x86: unify crash_32/64.c Most of contents in crash are same. Signed-off-by: Hiroshi Shimamoto Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 92f98b19bcce8b56ec6fc067702e211c36f19e88 Author: Hiroshi Shimamoto Date: Fri Oct 19 18:23:02 2007 -0700 x86: add safe_smp_processor_id for x86_64 Preperatory patch to allow crash_32/64.c merging Signed-off-by: Hiroshi Shimamoto Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 9b7711f0839d12edac3abfc2f3e4c5bdc660878b Author: Hiroshi Shimamoto Date: Fri Oct 19 18:21:11 2007 -0700 x86: add lapic_shutdown for x86_64 Preperatory patch to allow crash_32/64.c merging Signed-off-by: Hiroshi Shimamoto Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 703530238b580d69d4a112d3ab3d58c0eb1e7246 Author: Chris Snook Date: Sat Oct 20 02:56:59 2007 -0400 x86: merge mmu{,_32,_64}.h Merge mmu_32.h and mmu_64.h into mmu.h. Signed-off-by: Chris Snook Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 4d022adab4511892226f1eae00a44502bf685ae5 Author: Alejandro Martinez Ruiz Date: Wed Oct 17 14:38:58 2007 +0200 x86: ARRAY_SIZE cleanup Signed-off-by: Alejandro Martinez Ruiz Signed-off-by: Thomas Gleixner commit 8c660065383976f09fbdae86c33448c8da643d4e Author: Dave Johnson Date: Tue Oct 23 22:37:22 2007 +0200 x86: fix more TSC clock source calibration errors The previous patch wasn't correctly handling the 'count' variable. If a CPU gave bad results on the 1st or 2nd run but good results on the 3rd, it wouldn't do the correct thing. No idea if any such CPU exists, but the patch below handles that case by discarding the bad runs. If a bad result (too quick, or too slow) occurs on any of the 3 runs it will be discarded. Also updated some comments to explain what's going on. Signed-off-by: Dave Johnson Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit edaf420fdc122e7a42326fe39274c8b8c9b19d41 Author: Dave Johnson Date: Tue Oct 23 22:37:22 2007 +0200 x86: fix TSC clock source calibration error I ran into this problem on a system that was unable to obtain NTP sync because the clock was running very slow (over 10000ppm slow). ntpd had declared all of its peers 'reject' with 'peer_dist' reason. On investigation, the tsc_khz variable was significantly incorrect causing xtime to run slow. After a reboot tsc_khz was correct so I did a reboot test to see how often the problem occurred: Test was done on a 2000 Mhz Xeon system. Of 689 reboots, 8 of them had unacceptable tsc_khz values (>500ppm): range of tsc_khz # of boots % of boots ---------------- ---------- ---------- < 1999750 0 0.000% 1999750 - 1999800 21 3.048% 1999800 - 1999850 166 24.128% 1999850 - 1999900 241 35.029% 1999900 - 1999950 211 30.669% 1999950 - 2000000 42 6.105% 2000000 - 2000000 0 0.000% 2000050 - 2000100 0 0.000% [...] 2000100 - 2015000 1 0.145% << BAD 2015000 - 2030000 6 0.872% << BAD 2030000 - 2045000 1 0.145% << BAD 2045000 < 0 0.000% The worst boot was 2032.577 Mhz, over 1.5% off! It appears that on rare occasions, mach_countup() is taking longer to complete than necessary. I suspect that this is caused by the CPU taking a periodic SMI interrupt right at the end of the 30ms calibration loop. This would cause the loop to delay while the SMI BIOS hander runs. The resulting TSC value is beyond what it actually should be resulting in a higher tsc_khz. The below patch makes native_calculate_cpu_khz() take the best (shortest duration, lowest khz) run of it's 3 calibration loops. If a SMI goes off causing a bad result (long duration, higher khz) it will be discarded. With the patch applied, 300 boots of the same system produce good results: range of tsc_khz # of boots % of boots ---------------- ---------- ---------- < 1999750 0 0.000% 1999750 - 1999800 30 10.000% 1999800 - 1999850 166 55.333% 1999850 - 1999900 89 29.667% 1999900 - 1999950 15 5.000% 1999950 < 0 0.000% Problem was found and tested against 2.6.18. Patch is against 2.6.22. Signed-off-by: Dave Johnson Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 418ccbe37f70f5021c4cd1cdcb0ce7f98d05f2dd Author: Nick Piggin Date: Fri Oct 19 07:13:02 2007 +0200 x86: lock bitops I missed an obvious one! x86 CPUs are defined not to reorder stores past earlier loads, so there is no hardware memory barrier required to implement a release-consistent store (all stores are, by definition). So ditch the generic lock bitops, and implement optimised versions for x86, which removes the mfence from __clear_bit_unlock (which is already a useful primitive for SLUB). Signed-off-by: Nick Piggin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit ea5806559f92a3e7439bc7a4f2c0d04692e68931 Author: Adrian Bunk Date: Mon Oct 22 04:48:08 2007 +0200 x86: add instrumentation menu It seems commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 was incomplete due to a clash with the x86 architecture merge. Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 06063e26bc3ab62aa7aca874c6ce9e7638673838 Author: WANG Cong Date: Sat Oct 6 11:17:13 2007 +0800 [WATCHDOG] Documentation/watchdog/src/watchdog-simple.c: improve this code Make some improvements for Documentation/watchdog/src/watchdog-simple.c. Signed-off-by: WANG Cong Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit c283cf2c09ca1b7f1e7677bde384a8f92b1b7584 Author: Matteo Croce Date: Thu Sep 20 18:06:41 2007 +0200 [WATCHDOG] AR7: watchdog timer Driver for the watchdog timer. Still doesn't reboots the machine on some boards, but we have improved and cleaned it Signed-off-by: Matteo Croce Signed-off-by: Nicolas Thill Signed-off-by: Enrik Berkhan Signed-off-by: Christer Weinigel Signed-off-by: Wim Van Sebroeck commit 01ed08c14de6933e9f29ba3359a46598dae6f5b7 Author: Veljkovic Srdjan Date: Wed Sep 12 15:22:26 2007 +0200 [WATCHDOG] Linux kernel IPC SBC Watchdog Timer driver ICP's Wafer 5823 SBC has, as far as I can tell, the same WDT as many, if not all ICP's SBC's (that do have a WDT). I have tested it with several boards, including Rocky 4783, Rocky 3703 and Rocky 3782. I propose a rename of the Wafer 5823 watchdog timer driver to something like "IPC (SBC) Watchdog Timer", to reflect that it works with other IPC boards (maybe even all of them). Signed-off-by: Veljkovic Srdjan Signed-off-by: Wim Van Sebroeck commit af2709fd0d127cd590e7a77ab50b23cdb9f6f48f Author: Andrew Vasquez Date: Fri Oct 19 15:59:20 2007 -0700 [SCSI] qla2xxx: Update version number to 8.02.00-k5. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 8b7afc2a90d93d87d53732a9281c22facebe8d62 Author: Andrew Vasquez Date: Fri Oct 19 15:59:19 2007 -0700 [SCSI] qla2xxx: Correct display of ISP serial-number. The original serial-number calculations based on WWPN no longer apply to newer ISPs (ISP24xx and ISP25xx). These newer board's serial number reside in the VPD. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 6acf8190025e9c4ea513d4084ff089d476112816 Author: Andrew Vasquez Date: Fri Oct 19 15:59:18 2007 -0700 [SCSI] qla2xxx: Correct residual-count handling discrepancies during UNDERRUN handling. For recent ISPs, software during CS_UNDERRUN handling must determine if the two residuals, firmware-calculated and FCP_RSP, are different to recognize if a frame has been dropped. Update the driver to catch this condition, and clear the SS_RESIDUAL_UNDER and lscsi_status bits. This logic is consistent with what earlier firmwares did by explicitly cracking open the FCP_RSP statuses and clearing SS_RESIDUAL_UNDER. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 285d0321d15cf3130b3347a207ceae652ccc95b5 Author: Andrew Vasquez Date: Fri Oct 19 15:59:17 2007 -0700 [SCSI] qla2xxx: Make driver (mostly) legacy I/O port free. Recent ISPs need only the single MMIO BAR to manipulate HW registers. Unfortunately, ISP21xx, ISP22xx, ISP23xx, and ISP63xx type cards still require the I/O mapped region to manipulate the FLASH via the two HW flash-registers (flash_address and flash_data). Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 94d6a2b32864421467d48f9a3a1c7b1da1e1dadf Author: Andrew Vasquez Date: Fri Oct 19 15:59:16 2007 -0700 [SCSI] qla2xxx: Fix issue where final flash-segment updates were falling into the slow-path write handler. Original implementation would not use the burst-write mechanisms for requests equal to OPTROM_BURST_DWORDS transfer dwords. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 2c96d8d0c17978bbf5eb82314d488f46d4a51280 Author: Andrew Vasquez Date: Fri Oct 19 15:59:15 2007 -0700 [SCSI] qla2xxx: Handle unaligned sector writes during NVRAM/VPD updates. Since both NVRAM and VPD regions of the flash reside on unaligned sector boundaries, during update, the driver must perform a read-modify-write operation to the composite NVRAM/VPD region. This affects ISP25xx type boards only. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit a3a63d55a4eec418d845a91222ac53443f62717b Author: Andrew Vasquez Date: Fri Oct 19 15:59:14 2007 -0700 [SCSI] qla2xxx: Defer explicit interrupt-polling processing to init-time scenarios. As the intermixing may cause issues where HCCR bits could be cleared inappropriately during MSI/MSI-X interrupt handling. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 6557f3a06a5eb73b34d01b23523a513f2c52cadb Author: Andrew Vasquez Date: Fri Oct 19 15:59:13 2007 -0700 [SCSI] qla2xxx: Resync with latest HBA SSID specification -- 2.2u. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 194b2d0e9216dbd3a57fda31440611d515f1dfa2 Author: Dale Farnsworth Date: Sat Oct 20 12:16:27 2007 -0700 mv643xx_eth: Hook up mv643xx_get_sset_count Commit b9f2c044 replaced mv643xx_get_stats_count() with mv643xx_get_sset_count(), but forgot to hook it up. drivers/net/mv643xx_eth.c:2678: warning: mv643xx_get_sset_count defined but not used Signed-off-by: Dale Farnsworth commit aac6a5a34050a97016290f341e8de0a09f3a8f8c Author: Matthew Wilcox Date: Fri Oct 5 15:55:14 2007 -0400 [SCSI] sym53c8xx: Remove sym_xpt_async_sent_bdr This function just printed a message to the user; move the print to its only caller, and turn it into an starget_printk. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 5111eefa17615bdf17ca00ec2cdca16302c7697e Author: Matthew Wilcox Date: Fri Oct 5 15:55:13 2007 -0400 [SCSI] sym53c8xx: Remove pci_dev pointer from sym_shcb This structure is accessed by the device; the fewer Linux things in it, the better. Using the pci_dev pointer from the hostdata requires a lot of changes: - Pass Scsi_Host to a lot of routines which currently take a sym_hcb. - Set the Scsi_Host as the pci drvdata (instead of the sym_hcb) Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 99c9e0a1d6cfe1ba1169a7a81435ee85bc00e4a1 Author: Matthew Wilcox Date: Fri Oct 5 15:55:12 2007 -0400 [SCSI] sym53c8xx: Make interrupt handler capable of returning IRQ_NONE Make sym_interrupt return an irqreturn_t instead of void, and take a Scsi_Host instead of a sym_hcb. Pass the Scsi_Host to the interrupt handler instead of the sym_hcb. Rename the host_data to sym_data. Keep a pci_dev pointer in the sym_data. Rename the Scsi_Host from instance to shost. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 8022fbdacb0e9193a5dfb666479d1fc2ca63ecf1 Author: Matthew Wilcox Date: Fri Oct 5 15:55:11 2007 -0400 [SCSI] sym53c8xx: Get rid of IRQ_FMT and IRQ_PRM These macros aren't needed any more. They used to be used for SPARC. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 3fb364e089e05c35ead55a08d56d3004193681f6 Author: Matthew Wilcox Date: Fri Oct 5 15:55:10 2007 -0400 [SCSI] sym53c8xx: Use scmd_printk where appropriate If we have a scsi_cmnd, it gives the user more information than the sym_name, and maybe the target. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 4d85b471593d03e141f9160a58574b9204363267 Author: Matthew Wilcox Date: Fri Oct 5 15:55:09 2007 -0400 [SCSI] sym53c8xx: Simplify DAC DMA handling By introducing the use_dac(), set_dac() and DMA_DAC_MASK macros, we can eliminate a lot of ifdefs from the code. We now rely on the compiler to optimise away a few things that we'd formerly relied on the preprocessor to do. This makes sym_setup_bus_dma_mask() small enough to inline into its only caller. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit a44131b35ec1a46ed75014d818cb9d5706117b49 Author: Matthew Wilcox Date: Fri Oct 5 15:55:08 2007 -0400 [SCSI] sym53c8xx: Remove tag_ctrl module parameter With sysfs making these options tunable at runtime, there's no justification for keeping this horrendously complex specification string around. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 8637baa3609afff9fe4c65ad4c64d72484c699fc Author: Matthew Wilcox Date: Fri Oct 5 15:55:07 2007 -0400 [SCSI] sym53c8xx: Remove io_ws, mmio_ws and ram_ws elements These struct elements record info that is never needed Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit e58bc06ed071e43bef4e2f94340853761a4bf034 Author: Matthew Wilcox Date: Fri Oct 5 15:55:06 2007 -0400 [SCSI] sym53c8xx: Remove ->device_id Following the same path as ->revision_id, remove ->device_id Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit bd678450bfbd4bb6543a7138d9ee3418c2a11e7c Author: Matthew Wilcox Date: Fri Oct 5 15:55:05 2007 -0400 [SCSI] sym53c8xx: Use pdev->revision Auke missed the sym2 driver in his initial sweep. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit d68cd75992f95d6977956fb227f02e6d532f3d26 Author: Linas Vepstas Date: Fri Oct 5 15:55:04 2007 -0400 [SCSI] sym53c8xx: PCI Error Recovery support This patch adds the PCI error recovery callbacks to the Symbios SCSI device driver. It includes support for First Failure Data Capture. Signed-off-by: Linas Vepstas Assorted changes to initial patches, including returning IRQ_NONE from the interrupt handler if the device is offline and re-using the eh_done completion in the scsi error handler. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 2ba65367720d871f9d955ca3ef96358999182765 Author: Matthew Wilcox Date: Fri Oct 5 15:55:03 2007 -0400 [SCSI] sym53c8xx: Stop overriding scsi_done Instead of telling the reset routine that the command completed from sym_eh_done, do it from sym_xpt_done. The 'to_do' element of the ucmd is redundant -- it serves only to tell whether eh_done is valid or not, and we can tell this by checking to see if it's NULL. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 6c9746b363b8191587191518a65d5de93df80a92 Author: Matthew Wilcox Date: Fri Oct 5 15:55:02 2007 -0400 [SCSI] sym53c8xx: Don't disable interrupts in the interrupt handler Interrupts can't be re-entered, so it's sufficient to call spin_lock, not spin_lock_irqsave(). Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 71c222dc45ddf01b0dabb8a4d3e232e13e1452b5 Author: Matthew Wilcox Date: Fri Oct 5 15:55:01 2007 -0400 [SCSI] sym53c8xx: Remove unnecessary check in queuecommand The midlayer won't scan the host ID, so we don't need to check. This is the only caller of sym_xpt_done2, so remove that too. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 39c05d1e3c85c725e140ded1281bbb2303dfe5d3 Author: Matthew Wilcox Date: Fri Oct 5 15:55:00 2007 -0400 [SCSI] sym53c8xx: Remove data_mapping and data_mapped Before all commands used sg, data_mapping and data_mapped were used to distinguish whether the command had used map_single or map_sg. Now all commands are sg, so we can delete data_mapping, data_mapped and the wrapper functions __unmap_scsi_data, __map_scsi_sg_data, unmap_scsi_data and map_scsi_sg_data. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit f363abff55cad0e9c6e73c4eedae13d9ee794880 Author: Matthew Wilcox Date: Fri Oct 5 15:54:59 2007 -0400 [SCSI] sym53c8xx: Use pci_dev irq number Don't cache a private copy of the interrupt number Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 34996acc5571e64be7f3dba3adced1f7221a8d07 Author: Kai Makisara Date: Fri Oct 5 15:54:58 2007 -0400 [SCSI] sym53c8xx: Work around 53c896 erratum Prevent DMA transfers from crossing the 16MB limit for early 53c896 chips. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 117636092a87a28a013a4acb5de5492645ed620f Author: Ralf Baechle Date: Tue Oct 23 20:42:11 2007 +0200 [PATCH] Fix breakage after SG cleanups Commits 58b053e4ce9d2fc3023645c1b96e537c72aa8d9a ("Update arch/ to use sg helpers") 45711f1af6eff1a6d010703b4862e0d2b9afd056 ("[SG] Update drivers to use sg helpers") fa05f1286be25a8ce915c5dd492aea61126b3f33 ("Update net/ to use sg helpers") converted many files to use the scatter gather helpers without ensuring that the necessary headerfile is included. This happened to work for ia64, powerpc, sparc64 and x86 because they happened to drag in that file via their . On most of the others this probably broke. Instead of increasing the header file spider web I choose to include directly into the affectes files. Signed-off-by: Ralf Baechle Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 22150c4f0f02619c256f35db2f1ec912549b4ca5 Author: Latchesar Ionkov Date: Tue Oct 23 13:48:33 2007 -0500 9p: v9fs_vfs_rename incorrect clunk order In v9fs_vfs_rename function labels don't match the fids that are clunked. The correct clunk order is clunking newdirfid first and then olddirfid next. Signed-off-by: Latchesar Ionkov Signed-off-by: Eric Van Hensbergen commit 0a976297e1f57a6d156d3f8ed7f10c64beb031a4 Author: Adrian Bunk Date: Tue Oct 23 13:48:50 2007 -0500 9p: fix memleak in fs/9p/v9fs.c This patch fixes a memory leak introduced by commit ba17674fe02909fef049fd4b620a2805bdb8c693. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Eric Van Hensbergen commit b530cc794024be227876a089e66fb17b7b512763 Author: Eric Van Hensbergen Date: Tue Oct 23 13:47:31 2007 -0500 9p: add virtio transport This adds a transport to 9p for communicating between guests and a host using a virtio based transport. Signed-off-by: Eric Van Hensbergen commit 891039a9c2ddf73754ad84cdc9d030f1c6431858 Author: Emil Medve Date: Tue Oct 23 20:38:41 2007 +0200 xtensa: fix sg->page fallout Signed-off-by: Emil Medve Signed-off-by: Jens Axboe commit 4e0177647a3686f3658c26d52a60d0f1231c2127 Author: Emil Medve Date: Tue Oct 23 20:37:24 2007 +0200 mmc: fix sg->page fallout Signed-off-by: Emil Medve Signed-off-by: Jens Axboe commit de26103de56a0c482ad21296eae9b06deefc8e62 Author: Jens Axboe Date: Tue Oct 23 20:35:58 2007 +0200 [SG] Add debug check for page alignment Suggested by Boaz Harrosh Signed-off-by: Jens Axboe commit 20d2d3afa87781fe2674ce17bfb16af08a436e81 Author: Johannes Dickgreber Date: Thu Sep 20 01:07:50 2007 +0200 [SCSI] qla1280: eliminate wasted space in request and response ring i think there is wasted space in allocated pages for request and response rings. The allocations are made with REQUEST_ENTRY_CNT + 1 and RESPONSE_ENTRY_CNT + 1, but they are set with 256 and 16. So we got more pages, which we dont use very much so eliminate them. Signed-off-by: Johannes Dickgreber Acked-by: Jes Sorensen Signed-off-by: James Bottomley commit a98ce5c6feead6bfedefabd46cb3d7f5be148d9a Author: Herbert Xu Date: Tue Oct 23 11:26:25 2007 +0800 Fix synchronize_irq races with IRQ handler As it is some callers of synchronize_irq rely on memory barriers to provide synchronisation against the IRQ handlers. For example, the tg3 driver does tp->irq_sync = 1; smp_mb(); synchronize_irq(); and then in the IRQ handler: if (!tp->irq_sync) netif_rx_schedule(dev, &tp->napi); Unfortunately memory barriers only work well when they come in pairs. Because we don't actually have memory barriers on the IRQ path, the memory barrier before the synchronize_irq() doesn't actually protect us. In particular, synchronize_irq() may return followed by the result of netif_rx_schedule being made visible. This patch (mostly written by Linus) fixes this by using spin locks instead of memory barries on the synchronize_irq() path. Signed-off-by: Herbert Xu Acked-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 2f2c2679893c963bd90c5e1c0669b97fd87d1c4a Author: Greg Ungerer Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: cleanup m68knommu timer code Reduce the function pointer mess of the m68knommu timer code by calling directly to the local hardware's timer setup, and expose the local common timer interrupt handler to the lower level hardware timer. Ultimately this will save definitions of all these functions across all the platform code to setup the function pointers (which for any given m68knommu CPU family member can be only one set of hardware timer functions). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 49aa49bfd40d718095669c1c70c9d167b814e29b Author: Greg Ungerer Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: new style ColdFire UART driver A new style serial driver for the Freescale ColdFire UART to replace the old style one currently in the tree (drivers/serial/mcfserial.c). Currently this UART is only found in the ColdFire CPU family of parts (thus I prefixed this patch [M68KNOMMU]). This has been around for a long while now, tested on all available platforms. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit c48f484b9b7c8444247706b3ad9050245b8062f9 Author: Greg Ungerer Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: fix make archclean Remove build reference to arch/m68knommu/boot directory, it doesn't exist. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 293dba4b4acdfed75f92600792b5a00a942edc60 Author: Greg Ungerer Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: remove use of undefined symbols in setup.c Remove use of undefined symbols CONFIG_TELOS, CONFIG_M68EZ328ADS and CONFIG_ALMA_ANS. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit be6cb66da76fe089a4032a85c3825223a2216beb Author: Philippe De Muyter Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: improve mii_do_cmd code in FEC driver Improve the readability of mii_do_cmd(). Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit dbf18c8f62cd87473d6db8c16afe4207bc370d3e Author: Greg Ungerer Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: fix syscall restart handling Fix system call restart handling. We can call directly to the restart handler, no need to back track through trap that isn't even implemented on m68knommu. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit ada8d218cc951c424e677845a44f72b4ab55a7a7 Author: Wilson Callan Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: add make support for Savant/Rosie1 board Add make support for the Savant/Rosie1 board. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 775ecf871413e72a07c26af7154ca67728e17798 Author: Greg Ungerer Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: no separate stack region to report at startup There is no separate stack region addresses to print at startup time, so remove it from the debug listing Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit c1057c6500b6c5508c095f0022402cb63b747d5d Author: Wilson Callan Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: add config support for Savant/Rosie1 board Add configure support for the Savant/Rosie1 board. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit a65c1ec666f2557f3486dbe729411dfc0f6d888f Author: Greg Ungerer Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: updated defconfig Updated defconfig with new options for m68knommu. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit f186c9ad181ab9ba35e28cc9bbaafe226dbaec8c Author: Greg Ungerer Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: local module/elf definitions Up to now m68knommu has been using the asm-m68k/module.h instead of defining its own. There are recent changes there that we don't need (fixups specifically). We don't need much support here so it makes sense to have an m68knommu specific one now. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit fa2eae93a591b392d1056f95024516cede916ad4 Author: Matt Waddel Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: define __clear_user macro Define __clear_user macro, consistent with other architectures. fs/signalfd.c won't compile without it. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 151941a800fd9598d38f8b5a73de0471afe66507 Author: Matt Waddel Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: fix syscall tracing Fix the system call code for handling syscall tracing, so strace and gdbserver work properly. This fix originally developed by Philippe De Muyter and Stuart Hughes. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit f909b1ef8ce3e93d1cf66f33313d8ed11102e87f Author: Philippe De Muyter Date: Tue Oct 23 14:37:54 2007 +1000 m68knommu: improve code formating FEC driver Indent all the `else' the same way. Remove some unecesary white space. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7fa57a0cd98bdd163eeb5f15cbe234c3a0cf68a1 Author: Jiri Slaby Date: Mon Oct 22 20:45:13 2007 -0700 Char: cyclades, fix potential NULL dereference ztxdone is jumped to even if tty is NULL and tty_wakeup placed after this label doesn't expect NULLed parameter, so this will cause an oops in some situations (why they scheduled a wakeup there before remove bottom half processing patch?). wakeup only in the case when we have non-null tty struct. Spotted by Adrian Bunk. Signed-off-by: Jiri Slaby Cc: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ddd439ef987c9f0209e6ce824b67518f2afe67b Author: Hugh Dickins Date: Mon Oct 22 20:45:12 2007 -0700 fix mprotect vma_wants_writenotify prot Fix mprotect bug in recent commit 3ed75eb8f1cd89565966599c4f77d2edb086d5b0 (setup vma->vm_page_prot by vm_get_page_prot()): the vma_wants_writenotify case was setting the same prot as when not. Nothing wrong with the use of protection_map[] in mmap_region(), but use vm_get_page_prot() there too in the same ~VM_SHARED way. Signed-off-by: Hugh Dickins Cc: Coly Li Cc: Tony Luck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ae3f847e49e3787eca91bced31f8fd328d50496 Author: Dan Williams Date: Mon Oct 22 20:45:11 2007 -0700 md: raid5: fix clearing of biofill operations ops_complete_biofill() runs outside of spin_lock(&sh->lock) and clears the 'pending' and 'ack' bits. Since the test_and_ack_op() macro only checks against 'complete' it can get an inconsistent snapshot of pending work. Move the clearing of these bits to handle_stripe5(), under the lock. Signed-off-by: Dan Williams Tested-by: Joel Bertrand Signed-off-by: Neil Brown Cc: Stable Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85bfb4da8cad483a4e550ec89060d05a4daf895b Author: NeilBrown Date: Mon Oct 22 20:45:11 2007 -0700 md: fix an unsigned compare to allow creation of bitmaps with v1.0 metadata As page->index is unsigned, this all becomes an unsigned comparison, which almost always returns an error. Signed-off-by: Neil Brown Cc: Stable Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1f395f1c76b115c9691e1546942651fedb08c37 Author: Dale Farnsworth Date: Sat Oct 20 08:44:17 2007 -0700 mv643xx_eth: Remove obsolete checksum offload comment We fixed checksum offload a while back. Remove the note that it doesn't work. Signed-off-by: Dale Farnsworth commit fbd6a754f72a0a06e67544745b82c1d99b4c237d Author: Lennert Buytenhek Date: Fri Oct 19 16:03:46 2007 +0200 mv643xx_eth: Merge drivers/net/mv643xx_eth.h into mv643xx_eth.c Since drivers/net/mv643xx_eth.c is the only user of drivers/net/mv643xx_eth.h, there's not much use in having the header file as a separate file, so merge the header into the driver. Signed-off-by: Lennert Buytenhek Signed-off-by: Dale Farnsworth commit b45d9147f1582333e180e1023624c003874b7312 Author: Lennert Buytenhek Date: Fri Oct 19 04:11:47 2007 +0200 mv643xx_eth: Remove unused register defines Most of the register defines in drivers/net/mv643xx_eth.h aren't used at all. Nuke them -- we can always re-add them if/when we need them, and meanwhile, they unnecessarily clutter up the header file. Signed-off-by: Lennert Buytenhek Acked-by: Tzachi Perelstein Signed-off-by: Dale Farnsworth commit 5688fe87a458a73d5066eee3d5c9891459ba70bf Author: Lennert Buytenhek Date: Fri Oct 19 04:11:38 2007 +0200 mv643xx_eth: Clean up mv643xx_eth.h Apply the following cleanups to drivers/net/mv643xx_eth.h: * Change "#define" to "#define". * Fix comment block style. * Wrap lines to fit in 80 columns. * Change "foo<<1" to "foo << 1". * Align addresses in the same column. * Parenthesize macro arguments. * Replace "(1<<24) | (1<<23) | (1<<22)" type constructs with "(7 << 22)". Signed-off-by: Lennert Buytenhek Acked-by: Tzachi Perelstein Signed-off-by: Dale Farnsworth commit e4d00fa9bfed733051652a32686b9911e8549ac8 Author: Lennert Buytenhek Date: Fri Oct 19 04:11:28 2007 +0200 mv643xx_eth: Remove MV643XX_ETH_ register prefix Now that all register address and bit defines are in private namespace (drivers/net/mv643xx_eth.h), we can safely remove the MV643XX_ETH_ prefix to conserve horizontal space. Signed-off-by: Lennert Buytenhek Acked-by: Tzachi Perelstein Signed-off-by: Dale Farnsworth commit f9fbbc18dfcdc6156306f475de8b0bb96f97cd0d Author: Lennert Buytenhek Date: Fri Oct 19 04:11:17 2007 +0200 mv643xx_eth: Remove SHARED_REGS register address bias Start counting mv643xx_eth register addresses from zero, instead of from 0x2000 (MV643XX_ETH_SHARED_REGS.) Signed-off-by: Lennert Buytenhek Acked-by: Tzachi Perelstein Signed-off-by: Dale Farnsworth commit 9c1bbdfe6f70eb9132829caa9341a0294c2aee5d Author: Lennert Buytenhek Date: Fri Oct 19 04:11:03 2007 +0200 mv643xx_eth: Enable use on Orion platforms Allow Orion ARM platforms to use the mv643xx_eth driver. Signed-off-by: Lennert Buytenhek Acked-by: Tzachi Perelstein Signed-off-by: Dale Farnsworth commit 9f316841440c4c7e59227d0a3fe00a31ead1c436 Author: Lennert Buytenhek Date: Fri Oct 19 04:10:28 2007 +0200 mv643xx_eth: Disable RX/TX byte swapping on little-endian systems On little-endian systems, configure the SDMA unit with MV643XX_ETH_BLM_RX_NO_SWAP and MV643XX_ETH_BLM_TX_NO_SWAP. Signed-off-by: Lennert Buytenhek Acked-by: Tzachi Perelstein Signed-off-by: Dale Farnsworth commit e2734d6c61e0fd2b0f3aeac01e8dcd36c99b1a13 Author: Lennert Buytenhek Date: Fri Oct 19 04:10:10 2007 +0200 mv643xx_eth: Move ethernet register definitions into private header Move the mv643xx's ethernet-related register definitions from include/linux/mv643xx.h into drivers/net/mv643xx_eth.h, since they aren't of any use outside the ethernet driver. Signed-off-by: Lennert Buytenhek Acked-by: Tzachi Perelstein Signed-off-by: Dale Farnsworth commit c4a6a2ab5e99980b10d1eef761cd95f2a19ba46d Author: Lennert Buytenhek Date: Fri Oct 19 04:09:53 2007 +0200 mv643xx_eth: Split off mv643xx_eth platform device data The mv643xx ethernet silicon block is also found in a couple of other Marvell chips. As a first step towards splitting off the mv643xx_eth bits from the rest of the mv643xx bits, this patch splits the mv643xx ethernet platform device data struct in linux/mv643xx.h off into linux/mv643xx_eth.h, and includes the latter from the former. Signed-off-by: Lennert Buytenhek Acked-by: Tzachi Perelstein Signed-off-by: Dale Farnsworth commit 5a37cf19efcceae14c2078449e35b9f4eb3e63e4 Author: Alexey Korolev Date: Mon Oct 22 17:55:20 2007 +0100 [MTD] [NOR] Fix deadlock in Intel chip driver caused by get_chip recursion This patch solves kernel deadlock issue seen on JFFF2 simultaneous operations. Detailed investigation of the issue showed that the kernel deadlock is caused by tons of recursive get_chip calls. Signed-off-by: Alexey Korolev Acked-by: Nicolas Pitre Signed-off-by: David Woodhouse commit cb92ae81509eb5ddaea53884b60437502c837405 Author: FUJITA Tomonori Date: Tue Oct 23 12:58:39 2007 +0200 sparc64: zero out dma_length zero out dma_length in the entry immediately following the last mapped entry for unmap_sg. Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit 83fcaf70403ce04c693b52e62c794834b9a86089 Author: Jens Axboe Date: Tue Oct 23 12:54:14 2007 +0200 fvr32: fixup dma-mapping for new sg layout Signed-off-by: Jens Axboe commit 71df50a4e4ca9934bbf520c87612d711278f38af Author: Jens Axboe Date: Tue Oct 23 12:52:48 2007 +0200 sh/sh64: fixup dma-mapping for new sg layout Signed-off-by: Jens Axboe commit ebc3bbcfcf0a7fed2ac82f1a849a5f92cf4c217f Author: Christian Borntraeger Date: Tue Oct 23 12:46:32 2007 +0200 Fix sctp compile sctp fails to compile with net/sctp/sm_make_chunk.c: In function 'sctp_pack_cookie': net/sctp/sm_make_chunk.c:1516: error: implicit declaration of function 'sg_init_table' net/sctp/sm_make_chunk.c:1517: error: implicit declaration of function 'sg_set_page' use the proper include file. SCTP maintainers Vlad Yasevich and Sridhar Samudrala are CCed. Signed-off-by: Christian Borntraeger Signed-off-by: Jens Axboe commit 75d35c93cf8b938f28f06ceb8ffa2606d6e57d3b Author: Jens Axboe Date: Tue Oct 23 12:41:57 2007 +0200 m68knommu: remove sg_address() I would have replaced it with sg_virt(), but it doesn't appear to be used at all. Signed-off-by: Jens Axboe commit d09d276ebf62afdaed5f7bab6e7e340ffbde4dd1 Author: Jens Axboe Date: Tue Oct 23 12:39:41 2007 +0200 frv: update comment in scatterlist to reflect new setup Signed-off-by: Jens Axboe commit 26da10784866974d3e87ba998c66458c305777ca Author: Jens Axboe Date: Tue Oct 23 12:42:44 2007 +0200 blackfin: remove sg_address() I would have replaced it with sg_virt(), but it doesn't appear to be used at all. Signed-off-by: Jens Axboe commit dee9ba828fb5e72bef17450168774fb360dce983 Author: Jens Axboe Date: Tue Oct 23 12:37:59 2007 +0200 arm: sg fallout Signed-off-by: Jens Axboe commit 4fcc47a053adc786cc1ab84f3b8909eeb5c37963 Author: Jens Axboe Date: Tue Oct 23 12:32:34 2007 +0200 mips: sg_page() fallout Signed-off-by: Jens Axboe commit 944bda26fbfb3c30533b95ee4aaff72778008f78 Author: Jens Axboe Date: Tue Oct 23 12:31:05 2007 +0200 alpha: sg_virt() fallout Signed-off-by: Jens Axboe commit 2298a1dd819213802b8a7f955f9b382f5e92127a Author: Alejandro Martinez Ruiz Date: Mon Oct 22 21:18:24 2007 +0200 [AVR32] ARRAY_SIZE() cleanup Signed-off-by: Alejandro Martinez Ruiz Signed-off-by: Haavard Skinnemoen commit eaf5f925a31973e2fdc50c785665b90ff444eceb Author: Haavard Skinnemoen Date: Mon Oct 22 18:32:14 2007 +0200 [AVR32] Implement at32_add_device_cf() Implement at32_add_device_cf() which will add a platform_device for the at32_cf driver (not merged yet). Separate out most of the at32_add_device_ide() code and use it to implement at32_add_device_cf() as well. This changes the API in the following ways: * The board code must initialize data->cs to the chipselect ID to use before calling any of these functions. * The board code must use GPIO_PIN_NONE to indicate unused CF pins. Signed-off-by: Haavard Skinnemoen commit 2042c1c4e7a5e3b69ff3c3c5db6bf6416abd8b24 Author: Haavard Skinnemoen Date: Mon Oct 22 17:42:35 2007 +0200 [AVR32] Implement more at32_add_device_foo() functions Implement functions for adding platform devices for TWI, MCI, AC97C and ABDAC. They may need to be modified to cope with platform data, etc. when the corresponding drivers are ready to be merged, but such changes are much less likely to conflict than adding support for a whole new type of device. Signed-off-by: Haavard Skinnemoen commit 86298962c06c2584a8c4df5fb92a70179ca7e4f5 Author: Haavard Skinnemoen Date: Mon Oct 22 15:51:04 2007 +0200 [AVR32] Fix a couple of sparse warnings Signed-off-by: Haavard Skinnemoen commit 1c2f173796e4d692b71d1305adb833a104713cd8 Author: Hans-Christian Egtvedt Date: Mon Jul 16 16:13:33 2007 +0200 [AVR32] Wire up AT73C213 sound driver on ATSTK1000 board Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Haavard Skinnemoen commit 48021bd93ca339fcafe9b043d05f5d3a58be7c0a Author: Kristoffer Nyborg Gregertsen Date: Thu Aug 16 13:45:00 2007 +0200 [AVR32] Platform code for pata_at32 This patch adds platform code for PATA devices on the AP7000. [hskinnemoen@atmel.com: board code left out for now since stk1000 doesn't support IDE out of the box] Signed-off-by: Kristoffer Nyborg Gregertsen Signed-off-by: Haavard Skinnemoen commit 12d4d40e6fd583d32daeac0bc42123b23b7c40b7 Author: FUJITA Tomonori Date: Tue Oct 23 09:32:25 2007 +0200 intel-iommu: fix sg_page() Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit b61e8f4844fd0767b656bd1f983933cc3d0102f3 Author: FUJITA Tomonori Date: Tue Oct 23 09:30:28 2007 +0200 parisc: fix sg_page() fallout arch/parisc/kernel/pci-dma.c: In function 'pa11_dma_map_sg': arch/parisc/kernel/pci-dma.c:487: error: 'struct scatterlist' has no member named 'page' arch/parisc/kernel/pci-dma.c: In function 'pa11_dma_unmap_sg': arch/parisc/kernel/pci-dma.c:508: error: 'struct scatterlist' has no member named 'page' arch/parisc/kernel/pci-dma.c:508: error: 'struct scatterlist' has no member named 'page' arch/parisc/kernel/pci-dma.c: In function 'pa11_dma_sync_sg_for_cpu': arch/parisc/kernel/pci-dma.c:535: error: 'struct scatterlist' has no member named 'page' arch/parisc/kernel/pci-dma.c:535: error: 'struct scatterlist' has no member named 'page' arch/parisc/kernel/pci-dma.c: In function 'pa11_dma_sync_sg_for_device': arch/parisc/kernel/pci-dma.c:545: error: 'struct scatterlist' has no member named 'page' arch/parisc/kernel/pci-dma.c:545: error: 'struct scatterlist' has no member named 'page' Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit dc81785dd620c770cf929ff25bb4720e91c23f7a Author: FUJITA Tomonori Date: Tue Oct 23 09:29:58 2007 +0200 ide: build fix git-drivers/ide/ide-probe.c: In function 'hwif_init': drivers/ide/ide-probe.c:1327: error: implicit declaration of function 'sg_init_table' Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit b3b724f48c0c0ade1d5120744cc5c9a3e5193d08 Author: Heiko Carstens Date: Tue Oct 23 09:28:34 2007 +0200 net: fix xfrm build - missing scatterlist.h include net/xfrm/xfrm_algo.c: In function 'skb_icv_walk': net/xfrm/xfrm_algo.c:555: error: implicit declaration of function 'sg_set_page' make[2]: *** [net/xfrm/xfrm_algo.o] Error 1 Cc: David Miller Signed-off-by: Heiko Carstens Signed-off-by: Jens Axboe commit 7aeacf982203fb4dea2f3434eefdc268cfd5d6d9 Author: Jens Axboe Date: Tue Oct 23 09:49:25 2007 +0200 [BLOCK] blk_rq_map_sg: force clear termination bit Since blk_rq_map_sg() sets the termination bit at the end of the sg table, we could see it prematurely on the next mapping unless we force drivers to do a full sg_init_table() prior to each mapping. So force clear the termination bit to avoid having to put that clear in the driver for every mapping. Signed-off-by: Jens Axboe commit ad0d4083e65d9f223275adbfb9a7927e2120dc6c Author: Jens Axboe Date: Tue Oct 23 09:27:05 2007 +0200 [BLOCK] Don't clear sg_dma_len/addr() in blk_rq_map_sg() It's not a proper lvalue on all archs. Signed-off-by: Jens Axboe commit 73fc4f0d2ce4a92c36b00649c58e0a068a6cdfa4 Author: Jens Axboe Date: Tue Oct 23 09:17:53 2007 +0200 s390 zfcp: sg fixups Based on initial patch from Heiko Carstens Signed-off-by: Jens Axboe commit 5edadbd0ae35d2daabaf6b44f2c58d67d4021ed2 Author: Olof Johansson Date: Tue Oct 23 09:13:14 2007 +0200 powerpc: Fix fallout from sg_page() changes Fix fallout from 18dabf473e15850c0dbc8ff13ac1e2806d542c15: In file included from include/linux/dma-mapping.h:52, from drivers/base/dma-mapping.c:10: include/asm/dma-mapping.h: In function 'dma_map_sg': include/asm/dma-mapping.h:288: error: 'struct scatterlist' has no member named 'page' include/asm/dma-mapping.h:288: error: 'struct scatterlist' has no member named 'page' include/asm/dma-mapping.h:288: error: 'struct scatterlist' has no member named 'page' include/asm/dma-mapping.h:289: error: 'struct scatterlist' has no member named 'page' include/asm/dma-mapping.h:290: error: 'struct scatterlist' has no member named 'page' include/asm/dma-mapping.h: In function 'dma_sync_sg_for_cpu': include/asm/dma-mapping.h:331: error: 'struct scatterlist' has no member named 'page' drivers/scsi/ps3rom.c: In function 'fetch_to_dev_buffer': drivers/scsi/ps3rom.c:150: error: 'struct scatterlist' has no member named 'page' Signed-off-by: Olof Johansson Signed-off-by: Jens Axboe commit c8ac5a7309c5060e27caf69403072f54e008ee54 Author: Olof Johansson Date: Tue Oct 23 09:12:52 2007 +0200 IB/ehca: Fix sg_page() fallout More fallout from sg_page changes: drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user1': drivers/infiniband/hw/ehca/ehca_mrmw.c:1779: error: 'struct scatterlist' has no member named 'page' drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_check_kpages_per_ate': drivers/infiniband/hw/ehca/ehca_mrmw.c:1835: error: 'struct scatterlist' has no member named 'page' drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user2': drivers/infiniband/hw/ehca/ehca_mrmw.c:1870: error: 'struct scatterlist' has no member named 'page' Signed-off-by: Olof Johansson Signed-off-by: Jens Axboe commit 9f2326be52f4fa83d20a75998cd3c87b300588c4 Author: FUJITA Tomonori Date: Tue Oct 23 09:11:41 2007 +0200 arm: build fix arch/arm/common/dmabounce.c: In function 'dma_map_sg': arch/arm/common/dmabounce.c:445: error: implicit declaration of function 'sg_page' Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit 9efbf95f6204da0112371f41e63c7330f94e1042 Author: Jaroslav Kysela Date: Tue Oct 23 08:09:20 2007 +0200 [ALSA] version 1.0.15 Signed-off-by: Jaroslav Kysela commit 41923e441305728ba3640e773e55d16e4769145c Author: Takashi Iwai Date: Mon Oct 22 17:20:10 2007 +0200 [ALSA] hda-codec - Fix possible array overflow dac_nids arrays in each codec support code may have up to 5 items when assigned from the auto-configurator. Some codec codes have less numbers than the possible max. This patch defines the constant and fixes the array definitions. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7507e8da2f21476007501f04d8bce2b7d0cb3971 Author: Borislav Petkov Date: Mon Oct 22 17:11:09 2007 +0200 [ALSA] sound/core/control.c: hard-irq-safe -> hard-irq-unsafe lock warning The lock grabbed in snd_ctl_empty_read_queue() is hardirq-unsafe but we hold an hardirq-safe one already, so make the &ctl->read_lock also hard-irq-safe. Signed-off-by: Borislav Petkov Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 31127f2eb945f092010a457c65260b0e19471cc5 Author: Dawid Wrobel Date: Mon Oct 22 11:57:17 2007 +0200 [ALSA] usb-audio: Another USB mic quirk for Logitech Communicator webcam The patch adds the USB microphone quirk for Logitech Communicator (046d:08f5 Logitech, Inc.) webcam. Signed-off-by: Dawid Wrobel Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 35a1e0cce647737b88dac7ca526fc525d92b3fff Author: Takashi Iwai Date: Fri Oct 19 08:13:40 2007 +0200 [ALSA] hda-codec - Fix build without CONFIG_SND_HDA_GENERIC Fixed the build error from patch_sigmatel.c when built without CONFIG_SND_HDA_GENERIC by defining a dummy function to return error. Also, clean up hda_codec.c by removing unneeded ifdefs (the compiler will optimize out). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c8229c38c61b1acab1f3fc28275690da71907248 Author: Takashi Iwai Date: Fri Oct 19 08:06:21 2007 +0200 [ALSA] hda-codec - Fix Conexant 5045 volumes Fixed the init verbs and added the missing volume controls so that the driver works again with Conexant 5045 codec chip. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9a2a763e08889318d7ace9f59d7963661a46d393 Author: Takashi Iwai Date: Thu Oct 18 17:33:27 2007 +0200 [ALSA] hda-codec - Fix conflict of Master volume in STAC92xx codec The addition of volume knob as Master volume resulted in conflict with the existing one by stac92xx_auto_create_hp_ctls(). This patch fixes the conflict, and still keeps the Master control for codecs without volume knob as much as possible. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8e84c6413a2bec1c3e67bb38d42422f9f3262c10 Author: Trent Piepho Date: Thu Oct 18 10:48:43 2007 +0200 [ALSA] snd-bt87x: Make the load_all option work correctly If the load_all option was turned on all cards would be treated as unknown, even those which are in the database. Of course, if the card is in the database there is no reason to use the load_all option. It's there to force loading when the card isn't in the database. But there are out of date wikis that say to do this and some distros might turn this option on by default. So, we keep the load_all option from turning known cards into unknown cards. Signed-off-by: Trent Piepho Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 44e0b6821d7eacb4f93d2c131d436f96e500aa08 Author: Adrian McMenamin Date: Thu Oct 18 10:46:59 2007 +0200 [ALSA] protect Dreamcast PCM driver (AICA) from G2 bus effects The G2 bus on the SEGA Dreamcast connects both the maple peripheral bus and the AICA sound memory. DMA requests on one can cause the other to timeout on memory operations. This patch prevents maple interrupts from causing hiccoughs in the AICA sound (maple bus code will land in 2.6.24). There are other cleanups for this (AICA) code - but this is in effect a regression fix rather than a cleanup. Signed-off-by: Adrian McMenamin Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e5ab3a7c00e682e0e24677203856769df1b9b0cb Author: Takashi Iwai Date: Wed Oct 17 10:35:58 2007 +0200 [ALSA] bt87x - Fix section mismatch const and __devinit aren't a good pair, resulting in a section mismatch error. Let's remove const as a temporary solution. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 53eb1b85402f108d5151338cff4430f30fd9727f Author: Takashi Iwai Date: Wed Oct 17 10:09:32 2007 +0200 [ALSA] hda-codec - Fix AD1986A Lenovo auto-mute The jack detection bit on AD1986A Lenovo N100 seems inverse from the standard definition. Now fixed the detection properly. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9823adf632c57e9728d651707abd324eb4454eb9 Author: Krzysztof Helt Date: Tue Oct 16 14:54:58 2007 +0200 [ALSA] This simplifies and fixes waiting loops of the mce_down() function after Trent Piepho's patch for AD1848. It also makes busy_wait() function call not atomic. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 43d33b21a03d3abcc8cbdeb4d52bc4568f822c5e Author: Rusty Russell Date: Mon Oct 22 11:29:57 2007 +1000 Use "struct boot_params" in example launcher Now that the "struct boot_params" is userspace accessible, we don't need magic numbers. Signed-off-by: Rusty Russell commit 5bbf89fc260830f3f58b331d946a16b39ad1ca2d Author: Rusty Russell Date: Mon Oct 22 11:29:56 2007 +1000 Loading bzImage directly. Now arch/i386/boot/compressed/head.S understands the hardware_platform field, we can directly execute bzImages. No more horrific unpacking code. Signed-off-by: Rusty Russell commit 814a0e5cdfbd384f4bf7a8443f9c3b885f413d58 Author: Rusty Russell Date: Mon Oct 22 11:29:44 2007 +1000 Revert lguest magic and use hook in head.S Version 2.07 of the boot protocol uses 0x23C for the hardware_subarch field, that for lguest is "1". This allows us to use the standard boot entry point rather than the "GenuineLguest" string hack. The standard entry point also clears the BSS and copies the boot parameters and commandline for us, saving more code. Signed-off-by: Rusty Russell commit 1f5a29022ac66bc90cbe2a2162f56e9cd7b393ef Author: Chris Malley Date: Mon Oct 22 11:27:54 2007 +1000 Update lguest documentation to reflect the new virtual block device name. Signed-off-by: Chris Malley Signed-off-by: Rusty Russell commit 2d37f94a28170ca656438758fca577acb49a7932 Author: Rusty Russell Date: Mon Oct 22 11:24:24 2007 +1000 generalize lgread_u32/lgwrite_u32. Jes complains that page table code still uses lgread_u32 even though it now uses general kernel pte types. The best thing to do is to generalize lgread_u32 and lgwrite_u32. This means we lose the efficiency of getuser(). We could potentially regain it if we used __copy_from_user instead of copy_from_user, but I'm not certain that our range check is equivalent to access_ok() on all platforms. Signed-off-by: Rusty Russell Acked-by: Jes Sorensen commit 56ae43dfe233323683248a5c553bad7160db2fa5 Author: Rusty Russell Date: Mon Oct 22 11:24:23 2007 +1000 Example launcher handle guests not being ready for input We currently discard console and network input when the guest has no input buffers. This patch changes that, so that we simply stop listening to that fd until the guest refills its input buffers. This is particularly important because hvc_console without interrupts does backoff polling and so often lose characters if we discard. Signed-off-by: Rusty Russell commit 17cbca2ba3de990258943d9e5a1788430ca3ad0d Author: Rusty Russell Date: Mon Oct 22 11:24:22 2007 +1000 Update example launcher for virtio Implements virtio-based console, network and block servers. The block server uses a thread so it's async, which is an improvement over the old synchronous implementation (but a little more complex). Signed-off-by: Rusty Russell commit 19f1537b7b8a9a82665db3ad8210a9d954d13acd Author: Rusty Russell Date: Mon Oct 22 11:24:21 2007 +1000 Lguest support for Virtio This makes lguest able to use the virtio devices. We change the device descriptor page from a simple array to a variable length "type, config_len, status, config data..." format, and implement virtio_config_ops to read from that config data. We use the virtio ring implementation for an efficient Guest <-> Host virtqueue mechanism, and the new LHCALL_NOTIFY hypercall to kick the host when it changes. We also use LHCALL_NOTIFY on kernel addresses for very very early console output. We could have another hypercall, but this hack works quite well. Signed-off-by: Rusty Russell commit 15045275c32bf6d15d32c2eca8157be9c0ba6e45 Author: Rusty Russell Date: Mon Oct 22 11:24:10 2007 +1000 Remove old lguest I/O infrrasructure. This patch gets rid of the old lguest host I/O infrastructure and replaces it with a single hypercall "LHCALL_NOTIFY" which takes an address. The main change is the removal of io.c: that mainly did inter-guest I/O, which virtio doesn't yet support. Signed-off-by: Rusty Russell commit 0ca49ca946409f87a8cd0b14d5acb6dea58de6f3 Author: Rusty Russell Date: Mon Oct 22 11:20:02 2007 +1000 Remove old lguest bus and drivers. This gets rid of the lguest bus, drivers and DMA mechanism, to make way for a generic virtio mechanism. Signed-off-by: Rusty Russell commit 0a8a69dd77ddbd4513b21363021ecde7e1025502 Author: Rusty Russell Date: Mon Oct 22 11:03:40 2007 +1000 Virtio helper routines for a descriptor ringbuffer implementation These helper routines supply most of the virtqueue_ops for hypervisors which want to use a ring for virtio. Unlike the previous lguest implementation: 1) The rings are variable sized (2^n-1 elements). 2) They have an unfortunate limit of 65535 bytes per sg element. 3) The page numbers are always 64 bit (PAE anyone?) 4) They no longer place used[] on a separate page, just a separate cacheline. 5) We do a modulo on a variable. We could be tricky if we cared. 6) Interrupts and notifies are suppressed using flags within the rings. Users need only get the ring pages and provide a notify hook (KVM wants the guest to allocate the rings, lguest does it sanely). Signed-off-by: Rusty Russell Cc: Dor Laor commit b01d9f2863349b0e041b90c3c86a998ee0fed2b0 Author: Rusty Russell Date: Mon Oct 22 11:03:39 2007 +1000 Module autoprobing support for virtio drivers. This adds the logic to convert the virtio ids into module aliases, and includes a modalias entry in sysfs and the env var to make probing work. Signed-off-by: Rusty Russell commit 31610434bc3523c0b01a10917a1185096a03c4c8 Author: Rusty Russell Date: Mon Oct 22 11:03:39 2007 +1000 Virtio console driver This is an hvc-based virtio console driver. It's suboptimal becuase hvc expects to have raw access to interrupts and virtio doesn't assume that, so it currently polls. There are two solutions: expose hvc's "kick" interface, or wean off hvc. Signed-off-by: Rusty Russell commit e467cde238184d1b0923db2cd61ae1c5a6dc15aa Author: Rusty Russell Date: Mon Oct 22 11:03:38 2007 +1000 Block driver using virtio. The block driver uses scatter-gather lists with sg[0] being the request information (struct virtio_blk_outhdr) with the type, sector and inbuf id. The next N sg entries are the bio itself, then the last sg is the status byte. Whether the N entries are in or out depends on whether it's a read or a write. We accept the normal (SCSI) ioctls: they get handed through to the other side which can then handle it or reply that it's unsupported. It's not clear that this actually works in general, since I don't know if blk_pc_request() requests have an accurate rq_data_dir(). Although we try to reply -ENOTTY on unsupported commands, ioctl(fd, CDROMEJECT) returns success to userspace. This needs a separate patch. Signed-off-by: Rusty Russell Cc: Jens Axboe commit 296f96fcfc160e29c01819c0c7b20c2dc8320edd Author: Rusty Russell Date: Mon Oct 22 11:03:37 2007 +1000 Net driver using virtio The network driver uses two virtqueues: one for input packets and one for output packets. This has nice locking properties (ie. we don't do any for recv vs send). TODO: 1) Big packets. 2) Multi-client devices (maybe separate driver?). 3) Resolve freeing of old xmit skbs (Christian Borntraeger) Signed-off-by: Rusty Russell Cc: Christian Borntraeger Cc: Herbert Xu Cc: netdev@vger.kernel.org commit ec3d41c4db4c21164332826ea8d812f94f2f6886 Author: Rusty Russell Date: Mon Oct 22 11:03:36 2007 +1000 Virtio interface This attempts to implement a "virtual I/O" layer which should allow common drivers to be efficiently used across most virtual I/O mechanisms. It will no-doubt need further enhancement. The virtio drivers add buffers to virtio queues; as the buffers are consumed the driver "interrupt" callbacks are invoked. There is also a generic implementation of config space which drivers can query to get setup information from the host. Signed-off-by: Rusty Russell Cc: Dor Laor Cc: Arnd Bergmann commit 47436aa4ad054c1c7c8231618e86ebd9305308dc Author: Rusty Russell Date: Mon Oct 22 11:03:36 2007 +1000 Boot with virtual == physical to get closer to native Linux. 1) This allows us to get alot closer to booting bzImages. 2) It means we don't have to know page_offset. 3) The Guest needs to modify the boot pagetables to create the PAGE_OFFSET mapping before jumping to C code. 4) guest_pa() walks the page tables rather than using page_offset. 5) We don't use page_offset to figure out whether to emulate: it was always kinda quesationable, and won't work for instructions done before remapping (bzImage unpacking in particular). 6) We still want the kernel address for tlb flushing: have the initial hypercall give us that, too. Signed-off-by: Rusty Russell commit c18acd73ffc209def08003a1927473096f66c5ad Author: Rusty Russell Date: Mon Oct 22 11:03:35 2007 +1000 Allow guest to specify syscall vector to use. (Based on Ron Minnich's LGUEST_PLAN9_SYSCALL patch). This patch allows Guests to specify what system call vector they want, and we try to reserve it. We only allow one non-Linux system call vector, to try to avoid DoS on the Host. Signed-off-by: Rusty Russell commit ee3db0f2b6053b65f3b70253f5f810d9a3d67b28 Author: Rusty Russell Date: Mon Oct 22 11:03:34 2007 +1000 Rename "cr3" to "gpgdir" to avoid x86-specific naming. Signed-off-by: Rusty Russell commit df29f43e650df29456804dabdb2611de914e7c0f Author: Matias Zabaljauregui Date: Mon Oct 22 11:03:33 2007 +1000 Pagetables to use normal kernel types This is my first step in the migration of page_tables.c to the kernel types and functions/macros (2.6.23-rc3). Seems to be working OK. Signed-off-by: Matias Zabaljauregui Signed-off-by: Rusty Russell commit 47aee45ae3c708ab678e09abfba0efaf6ca0e87a Author: Jes Sorensen Date: Mon Oct 22 11:03:33 2007 +1000 lguest.h declares a struct timespec, make it include linux/time.h Signed-off-by: Jes Sorensen Signed-off-by: Rusty Russell commit d612cde060a005c1effb13d0f665448a04ce5f67 Author: Jes Sorensen Date: Mon Oct 22 11:03:32 2007 +1000 Move register setup into i386_core.c Move setup_regs() to lguest_arch_setup_regs() in i386_core.c given that this is very architecture specific. Signed-off-by: Jes Sorensen Signed-off-by: Rusty Russell commit 511801dc31c095b2bfe3bf5c6a370dbe9b042a70 Author: Jes Sorensen Date: Mon Oct 22 11:03:31 2007 +1000 Change example launcher to use unsigned long not u32 Apply Clue 2x4 to lguest userland<->kernel handling code and the lguest launcher. Pointers are not to be passed in u32's! Basic rule of thumb: Anything passing u32's back and forth should be passing unsigned longs to be portable to 64 bit archs. For those who forgotten already, I repeat: NO POINTERS IN u32! Signed-off-by: Jes Sorensen Signed-off-by: Rusty Russell commit b410e7b1499c49513cab18275db8a8ab549d9e09 Author: Jes Sorensen Date: Mon Oct 22 11:03:31 2007 +1000 Make hypercalls arch-independent. Clean up the hypercall code to make the code in hypercalls.c architecture independent. First process the common hypercalls and then call lguest_arch_do_hcall() if the call hasn't been handled. Rename struct hcall_ring to hcall_args. This patch requires the previous patch which reorganize the layout of struct lguest_regs on i386 so they match the layout of struct hcall_args. Signed-off-by: Jes Sorensen Signed-off-by: Rusty Russell commit cc6d4fbcef328acdc9fa7023e69f39f753f72fe1 Author: Rusty Russell Date: Mon Oct 22 11:03:30 2007 +1000 Introduce "hcall" pointer to indicate pending hypercall. Currently we look at the "trapnum" to see if the Guest wants a hypercall. But once the hypercall is done we have to reset trapnum to a bogus value, otherwise if we exit to userspace and return, we'd run the same hypercall twice (that was a nasty bug to find!). This has two main effects: 1) When Jes's patch changes the hypercall args to be a generic "struct hcall_args" we simply change the type of "lg->hcall". It's set by arch code, so if it has to copy args or something it can do so, and point "hcall" into lg->arch somewhere. 2) Async hypercalls only get run when an actual hypercall is pending. This simplfies the code a little and is a more logical semantic. Signed-off-by: Rusty Russell commit 4614a3a3b638dfd7a67d0237944f6a76331af61d Author: Jes Sorensen Date: Mon Oct 22 11:03:29 2007 +1000 Reorder guest saved regs to match hyperall order Move eax next to ebx/ecx/edx in struct lguest_regs on i386, so they will be located together and allow it to map directly to a struct hcall_ring entry (which will be renamed struct hcall_args as in a subsequent patch). This is in preparation for making the code hcall code architecture independent. Signed-off-by: Jes Sorensen Signed-off-by: Rusty Russell commit 625efab1cd3d4da4634dfe26df6b4005385397e2 Author: Jes Sorensen Date: Mon Oct 22 11:03:28 2007 +1000 Move i386 part of core.c to x86/core.c. Separate i386 architecture specific from core.c and move it to x86/core.c and add x86/lguest.h header file to match. Signed-off-by: Jes Sorensen Signed-off-by: Rusty Russell commit 56adbe9ddc935600c64635d6a55c260a63c67e4a Author: Rusty Russell Date: Mon Oct 22 11:03:28 2007 +1000 Make shadow IDT a complete IDT with 256 entries. This simplifies the code a little, in preparation for allowing alternate system call vectors in guests (Plan 9 uses 0x40). Signed-off-by: Rusty Russell commit 48245cc0708d49d1d0566b9fa617ad6c5f4c6934 Author: Rusty Russell Date: Mon Oct 22 11:03:27 2007 +1000 Remove fixed limit on number of guests, and lguests array. Back when we had all the Guest state in the switcher, we had a fixed array of them. This is no longer necessary. If we switch the network code to using random_ether_addr (46 bits is enough to avoid clashes), we can get rid of the concept of "guest id" altogether. Signed-off-by: Rusty Russell commit 3c6b5bfa3cf3b4057788e08482a468cc3bc00780 Author: Rusty Russell Date: Mon Oct 22 11:03:26 2007 +1000 Introduce guest mem offset, static link example launcher In order to avoid problematic special linking of the Launcher, we give the Host an offset: this means we can use any memory region in the Launcher as Guest memory rather than insisting on mmap() at 0. The result is quite pleasing: a number of casts are replaced with simple additions. Signed-off-by: Rusty Russell commit 6649bb7af6a819b675bfcf22ab704737e905645a Author: Ronald G. Minnich Date: Tue Aug 28 14:35:59 2007 -0700 Accept elf files that are valid but have sections that can not be mmap'ed for some reason. Plan9 kernel binaries don't neatly align their ELF sections to our page boundaries. Signed-off-by: Ronald G. Minnich Signed-off-by: Rusty Russell commit 1f4e1de4f23e158abf976a76e1d0fce6e39b532a Author: Rusty Russell Date: Mon Oct 22 11:03:25 2007 +1000 Rename switcher.S to x86/switcher_32.S lguest uses a "switcher" shim mapped high to bounce between host and guest. As lguest becomes less i386-centric, we separate this code into a subdir. Signed-off-by: Rusty Russell commit 34b8867a034364ca33d0adb3a1c5b9982903c719 Author: Rusty Russell Date: Mon Oct 22 11:01:54 2007 +1000 Move lguest guest support to arch/x86. Lguest has two sides: host support (to launch guests) and guest support (replacement boot path and paravirt_ops). This moves the guest side to arch/x86/lguest where it's closer to related code. Signed-off-by: Rusty Russell Cc: Andi Kleen commit c37ae93d597fc63bae979db76b527dcc7740dc9d Author: Jes Sorensen Date: Mon Oct 22 10:56:26 2007 +1000 Move lguest hcalls to arch-specific header Move architecture specific portion of lg_hcall code to asm-i386/lg_hcall.h and have it included from linux/lguest.h. [Changed to asm-i386/lguest_hcall.h so documentation finds it -RR] Signed-off-by: Jes Sorensen Signed-off-by: Rusty Russell Cc: Jes Sorensen commit 05aa026a62d0fe0b4664a01d1537984b12567e7c Author: Tony Breeds Date: Mon Oct 22 10:56:25 2007 +1000 Clocksource is continuous regardless of the state of the host's TSC. Currently lguest will spend a lot of of time waking up the host, as it cannot go tickless (if the [host] TSC has been marked unstable). On my laptop I was getting ~40% of wakeups from lguest. With this patch applied, my laptop is much happier! Signed-off-by: Tony Breeds Signed-off-by: Rusty Russell commit ebac52524df31e7c2fe13ca5bd3438907842f763 Author: Rusty Russell Date: Mon Oct 22 10:56:24 2007 +1000 lguest_devices belongs in lguest_bus.c: it's not i386-specific. Signed-off-by: Rusty Russell commit b45d8cb054d7677d75176ae22a584fd84e4650e9 Author: Rusty Russell Date: Mon Oct 22 10:56:24 2007 +1000 Make lguest_launcher.h types userspace-friendly lguest_launcher.h uses "u32" not "__u32", which sets a bad example. Fix that, and include . This means we need to use -I on the Launcher build line so types.h is found. Signed-off-by: Rusty Russell commit 9653c4aff94e43de5f4ef918d47e00018beb4105 Author: Rusty Russell Date: Mon Oct 22 10:56:23 2007 +1000 lguest.txt update o Describe the new split configurations o Highlight code documentation in drivers/lguest/README o Point out necessity of having a getty on /dev/hvc0 o Remove gratuitous "m" in example o Don't discuss I/O model here, stick to user documentation. Signed-off-by: Rusty Russell commit 141341cdae5f1745e3903a6b9732672230b1dd64 Author: Rusty Russell Date: Mon Oct 22 10:56:22 2007 +1000 Lguest currently depends on 32-bit x86, not just x86. Signed-off-by: Rusty Russell commit 891ff65ff50bb6affdaebb2cda3a4c58a6442b4d Author: Jes Sorensen Date: Mon Oct 22 10:56:22 2007 +1000 Use copy_to_user() not put_user for struct timespec Use copy_to_user() when copying a struct timespec to the guest - put_user() cannot handle two long's in one go on a 64bit arch. Signed-off-by: Jes Sorensen Signed-off-by: Rusty Russell Cc: Jes Sorensen Cc: Al Viro commit babed5c00225f109d6ebea368ad2deea2abcce32 Author: Glauber de Oliveira Costa Date: Mon Oct 22 10:56:21 2007 +1000 turn err into errx in lguest call sites These two callsites should really be errx instead of err, since there is no errno associated with them in the moment they are issued. Signed-off-by: Glauber de Oliveira Costa Signed-off-by: Rusty Russell Cc: Glauber de Oliveira Costa commit 25e82eba3a351cc3b263cae765a8786c827e42af Author: Rusty Russell Date: Tue Oct 23 15:19:49 2007 +1000 Remove binfmts.h include from lg.h It wasn't needed since a very early prototype of lguest. Signed-off-by: Rusty Russell commit ee8e7cfe9d330d6f1ce0b9b1620d6df5d9cf6b70 Author: Rusty Russell Date: Mon Oct 22 10:56:19 2007 +1000 Make asm-x86/bootparam.h includable from userspace. To actually write a bootloader (or, say, the lguest launcher) currently requires duplication of these structures. Making them includable from userspace is much nicer. We merge the common userspace-required definitions of e820_32/64.h into e820.h for export. Signed-off-by: Rusty Russell commit 9525ca0286afd54a5cd69d9ded741b4df8d0c554 Author: Rusty Russell Date: Mon Oct 22 10:55:43 2007 +1000 Consolidate host virtualization support under Virtualization menu Move lguest under the virtualization menu. Signed-off-by: Rusty Russell Cc: Avi Kivity commit d3d1c4bdf16bd154d9f27f34fca28edca90465eb Author: Rusty Russell Date: Mon Oct 22 10:55:21 2007 +1000 Normalize config options for guest support 1) Group all the "guest OS" support options together, under a PARAVIRT_GUEST menu. 2) Make those options select CONFIG_PARAVIRT, as suggested by Andi. 3) Make kconfig help titles consistent. Signed-off-by: Rusty Russell Cc: Andi Kleen Cc: Zach Amsden Cc: Jeremy Fitzhardinge Cc: Chris Wright commit dba5baf32887f58414ed7183a95309686894eab2 Author: Marcelo Tosatti Date: Mon Sep 10 18:46:01 2007 -0400 [POWERPC] Add Vitaly Bordug as PPC8xx maintainer Vitaly has been doing most of the 8xx maintenance work. Signed-off-by: Marcelo Tosatti Signed-off-by: Paul Mackerras commit 0895e91d60ef9bdef426d1ce14bb94bd5875870d Author: Randy Dunlap Date: Sun Oct 21 21:00:10 2007 -0700 procfs: fix kernel-doc param warnings Fix mnt_flush_task() misplaced kernel-doc. Fix typos in some of the doc text. Warning(linux-2.6.23-git17//fs/proc/base.c:2280): No description found for parameter 'mnt' Warning(linux-2.6.23-git17//fs/proc/base.c:2280): No description found for parameter 'pid' Warning(linux-2.6.23-git17//fs/proc/base.c:2280): No description found for parameter 'tgid' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 481968f44e81aac3b1b4863baf2c497ec46388f6 Author: Randy Dunlap Date: Sun Oct 21 20:59:53 2007 -0700 auditsc: fix kernel-doc param warnings Fix kernel-doc for auditsc parameter changes. Warning(linux-2.6.23-git17//kernel/auditsc.c:1623): No description found for parameter 'dentry' Warning(linux-2.6.23-git17//kernel/auditsc.c:1666): No description found for parameter 'dentry' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit e95d9c6b046f665da551a51b4071902336a6118c Author: David Miller Date: Mon Oct 22 02:09:00 2007 -0700 Expand hwif->host_flags so that it fits new flags. Commit 238e4f142c33bb34440cc64029dde7b9fbc4e65f ("ide: add IDE_HFLAG_NO_LBA48 and IDE_HFLAG_NO_LBA48_DMA host flags") caused a regression because the host_flags in struct hwif_s wasn't expanded to cope with the fact that the host flags no longer fit in 16 bits. Signed-off-by: David S. Miller [ I hate having to add good commit descriptions. - Linus ] Signed-off-by: Linus Torvalds commit 3650b0a304663d98a63c68f9020eb1ded477989e Author: Grant Likely Date: Mon Oct 22 16:38:32 2007 -0600 ppc: fix AT_VECTOR_SIZE on arch/ppc Commit 4f9a58d75bfe82ab2b8ba5b8506dfb190a267834 ("increase AT_VECTOR_SIZE to terminate saved_auxv properly") changes the size of AT_VECTOR_SIZE from hard coded '44' to a calculation based on the value of AT_VECTOR_SIZE_ARCH and AT_VECTOR_SIZE_BASE. The change works for arch/powerpc, but it breaks arch/ppc because the needed AT_VECTOR_SIZE_ARCH is not present in include/asm-ppc/system.h and a default value of 0 is used instead. This results in AT_VECTOR_SIZE being too small and it causes a kernel crash on loading init. Signed-off-by: Grant Likely Signed-off-by: Linus Torvalds commit 5081dba6588a0c228821ede4635441f7758eb757 Author: Eric W. Biederman Date: Mon Oct 22 12:55:36 2007 -0600 Fix appletalk sysctl entry name Gabriel C reported that modprobing appletalk on current git gives a warning in dmesg : "sysctl table check failed: /net/appletalk .3.7 procname does not match binary path procname" Oops. My apologies it appears I made a mistake when creating my table to check up on sysctl values. Signed-off-by: "Eric W. Biederman" Tested-by: Gabriel C Signed-off-by: Linus Torvalds commit 29f139ce27c7e64a3e8575afa8deb46cde09db0a Author: Alejandro Martinez Ruiz Date: Mon Oct 22 17:24:19 2007 -0700 [SPARC64]: ARRAY_SIZE() cleanup Signed-off-by: Alejandro Martinez Ruiz Signed-off-by: David S. Miller commit 8a53514043e380aa573baa805298a7727c993985 Author: Eric Paris Date: Mon Oct 22 16:10:31 2007 -0400 SELinux: always check SIGCHLD in selinux_task_wait When checking if we can wait on a child we were looking at p->exit_signal and trying to make the decision based on if the signal would eventually be allowed. One big flaw is that p->exit_signal is -1 for NPTL threads and so aignal_to_av was not actually checking SIGCHLD which is what would have been sent. Even is exit_signal was set to something strange it wouldn't change the fact that the child was there and needed to be waited on. This patch just assumes wait is based on SIGCHLD. Specific permission checks are made when the child actually attempts to send a signal. This resolves the problem of things like using GDB on confined domains such as in RH BZ 232371. The confined domain did not have permission to send a generic signal (exit_signal == -1) back to the unconfined GDB. With this patch the GDB wait works and since the actual signal sent is allowed everything functions as it should. Signed-off-by: Eric Paris Signed-off-by: James Morris commit dab969c00b8bee17a47057bbb91cd0a348cf6f76 Author: Atsushi Nemoto Date: Tue Oct 23 01:14:06 2007 +0900 [MIPS] time: Make c0_compare_int_usable more bullet proof Use write_c0_compare(read_c0_count()) to clear interrupt. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 17f690be454de447d8ddc586fa418ebfdb200966 Author: Ralf Baechle Date: Mon Oct 22 19:10:57 2007 +0100 [MIPS] Kbuild: Use the new cc-cross-prefix feature. Signed-off-by: Ralf Baechle commit 9490094b141003d692320113a662224a9fa2ef42 Author: Ralf Baechle Date: Mon Oct 22 15:17:39 2007 +0100 [MIPS] Fix include wrapper symbol to something sane. And why are there i8253.h and 8253pit.h ... Signed-off-by: Ralf Baechle commit fa33a54646fa305a7cf5a2872da062f20ac94b6f Author: Ralf Baechle Date: Mon Oct 22 15:13:22 2007 +0100 [MIPS] Malta: Delete dead code. Signed-off-by: Ralf Baechle commit 1097c6ac33defae6cf501b7919c23faf240601f0 Author: Yoichi Yuasa Date: Mon Oct 22 19:43:15 2007 +0900 [MIPS] time: Add GT641xx timer0 clockevent driver And make use of it for Cobalt. A few others such as the Malta could make use of it as well. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit d04533650f64fe3367e180f3e488d92205152cd3 Author: Ralf Baechle Date: Mon Oct 22 10:38:44 2007 +0100 [MIPS] time: SMP-proofing of Sibyte clockevent/clocksource code. The BCM148 has 4 cores but there are also just 4 generic timers available so use the ZBbus cycle counter instead of it. In addition the ZBbus counter also offers a much higher resolution and 64-bit counting so I'm considering a later complete conversion to it once I figure out if all members of the Sibyte SOC family support it - the docs seem to agree but the headers files seem to disagree ... Signed-off-by: Ralf Baechle commit 06d428d719dece96c01532b62df4140f4e69a308 Author: Ralf Baechle Date: Mon Oct 22 10:34:13 2007 +0100 [MIPS] time: SMP/NUMA-proofing of IP27 HUB RT timer code. Signed-off-by: Ralf Baechle commit 508a775a3c9c6c3f952338f6722ea8bc92899962 Author: Atsushi Nemoto Date: Sat Oct 20 00:28:33 2007 +0900 [MIPS] time: Fix calculation in clockevent_set_clock() Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d6ec084200c37683278c821338f74ddf21ab80f5 Author: Jens Axboe Date: Mon Oct 22 20:01:06 2007 +0200 Add CONFIG_DEBUG_SG sg validation Add a Kconfig entry which will toggle some sanity checks on the sg entry and tables. Signed-off-by: Jens Axboe commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15 Author: Jens Axboe Date: Mon Oct 22 19:57:20 2007 +0200 Change table chaining layout Change the page member of the scatterlist structure to be an unsigned long, and encode more stuff in the lower bits: - Bits 0 and 1 zero: this is a normal sg entry. Next sg entry is located at sg + 1. - Bit 0 set: this is a chain entry, the next real entry is at ->page_link with the two low bits masked off. - Bit 1 set: this is the final entry in the sg entry. sg_next() will return NULL when passed such an entry. It's thus important that sg table users use the proper accessors to get and set the page member. Signed-off-by: Jens Axboe commit 58b053e4ce9d2fc3023645c1b96e537c72aa8d9a Author: Jens Axboe Date: Mon Oct 22 20:02:46 2007 +0200 Update arch/ to use sg helpers Signed-off-by: Jens Axboe commit f9527f121bd42c5d300815fbf12216bc1a63f60f Author: Jens Axboe Date: Mon Oct 22 19:44:53 2007 +0200 Update swiotlb to use sg helpers Signed-off-by: Jens Axboe commit fa05f1286be25a8ce915c5dd492aea61126b3f33 Author: Jens Axboe Date: Mon Oct 22 19:44:26 2007 +0200 Update net/ to use sg helpers Signed-off-by: Jens Axboe commit 60c74f81933635bb4ccb4ee6f31909c51f5cd230 Author: Jens Axboe Date: Mon Oct 22 19:43:30 2007 +0200 Update fs/ to use sg helpers Signed-off-by: Jens Axboe commit 45711f1af6eff1a6d010703b4862e0d2b9afd056 Author: Jens Axboe Date: Mon Oct 22 21:19:53 2007 +0200 [SG] Update drivers to use sg helpers Signed-off-by: Jens Axboe commit 631bcfbbc5be0d778a2513988a56e5bd53bfb495 Author: Geert Uytterhoeven Date: Sun Oct 21 19:55:00 2007 +0200 kbuild: cc-cross-prefix spelling Spelling fixes for cc-cross-prefix documentation Signed-off-by: Geert Uytterhoeven Signed-off-by: Sam Ravnborg commit d8d2e78a061e1ace98544b100b7837c620fbb950 Author: Sam Ravnborg Date: Mon Oct 22 11:30:45 2007 +0200 kbuild: allow depmod in cross builds again depmod from module-init-tools 3.3-pre2 are reported to work fine in cross build. depmod from module-init-tools 3.1-pre5 are known to SEGV Do not workaround older module-init-tools bugs here. The right fix is for users to upgrade module-init-tools. Signed-off-by: Sam Ravnborg Cc: Geert Uytterhoeven commit ab19f8794a66910ef9b33041ccfa05b6b12ab6c9 Author: Sam Ravnborg Date: Mon Oct 22 11:23:07 2007 +0200 kbuild: fix modules_install after a 'make vmlinux' make vmlinux would delete the content of $(MODVERDIR) equals .tmp_versions. This caused a subsequent make modules_install to fail. Fix it so we clean the directory only for the modules build - but we still unconditionally create it so we can do: make dir/file.ko without a preceeding make modules. Reported by David Miller Signed-off-by: Sam Ravnborg Cc: David Miller commit 4b6d51ec62d9c57432430528d6293605794a9f1b Author: Stefan Richter Date: Sun Oct 21 11:20:07 2007 +0200 firewire: fw-ohci: shut up a superfluous compiler warning New warning since commit ab88ca488b8af66c3defa165874e81e695319a19, "firewire: fw-ohci: missing dma_unmap_single": drivers/firewire/fw-ohci.c: In function 'at_context_transmit': drivers/firewire/fw-ohci.c:609: warning: 'payload_bus' may be used uninitialized in this function Access to payload_bus is conditional on packet->payload_length > 0, and that won't change while in at_context_queue_packet. Signed-off-by: Stefan Richter commit c74e92c209cf30ae6003e042e7c017eb6c370b64 Author: Stefan Richter Date: Sun Oct 21 10:43:11 2007 +0200 firewire: fw-ohci: log a note about unsupported features because there seems to be more time needed to implement this. Also, change related error return values to more appropriate ones. Signed-off-by: Stefan Richter commit 78c2f0b8c285c5305b3e67b0595200541e15eb43 Author: Jens Axboe Date: Mon Oct 22 19:40:16 2007 +0200 [SG] Update crypto/ to sg helpers Signed-off-by: Jens Axboe commit 9b61764bcb4360e04386f0415a01da8271631004 Author: Jens Axboe Date: Mon Oct 22 19:39:33 2007 +0200 [SG] Update block layer to use sg helpers Signed-off-by: Jens Axboe commit 49d3bd7e2b990e717aa66e229410b8f5096c4956 Author: Laurent Vivier Date: Mon Oct 22 16:33