commit 55b637c6a003a8c4850b41a2c2fd6942d8a7f530 Author: Linus Torvalds Date: Fri May 18 21:06:17 2007 -0700 Linux v2.6.22-rc2 commit e9ca75b53576ddf82ea2d803f87c59dffac7bc42 Author: Gerald Britton Date: Mon May 14 13:53:01 2007 -0400 cciss: Fix pci_driver.shutdown while device is still active Fix an Oops in the cciss driver caused by system shutdown while a filesystem on a cciss device is still active. The cciss_remove_one function only properly removes the device if the device has been cleanly released by its users, which is not the case when the pci_driver.shutdown method is called. This patch adds a new cciss_shutdown function to better match the pattern used by various SCSI drivers: deactivate device interrupts and flush caches. It also alters the cciss_remove_one function to match and readds the __devexit annotation that was removed when cciss_remove_one was serving as the pci_driver.shutdown method. Signed-off-by: Gerald Britton Acked-by: Mike Miller Signed-off-by: Linus Torvalds commit dec04cff500d4e543c55ab1beb0af85d8ed7e6bd Author: H. Peter Anvin Date: Thu May 17 15:50:47 2007 -0700 Further update of the i386 boot documentation A number of items in the i386 boot documentation have been either vague, outdated or hard to read. This text revision adds several more examples, including a memory map for a modern kernel load. It also adds a field-by-field detailed description of the setup header, and a bootloader ID for Qemu. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit 1a06a52ee1b0cdb65222474ba6186f3991df68b0 Author: Rolf Eike Beer Date: Thu May 17 23:56:56 2007 +0200 Fix roundup_pow_of_two(1) 1 is a power of two, therefore roundup_pow_of_two(1) should return 1. It does in case the argument is a variable but in case it's a constant it behaves wrong and returns 0. Probably nobody ever did it so this was never noticed. Signed-off-by: Rolf Eike Beer Signed-off-by: Linus Torvalds commit 18963c01b8abf381f102752ce024c3582a716125 Author: Davide Libenzi Date: Fri May 18 12:02:33 2007 -0700 timerfd use waitqueue lock ... The timerfd was using the unlocked waitqueue operations, but it was using a different lock, so poll_wait() would race with it. This makes timerfd directly use the waitqueue lock. Signed-off-by: Davide Libenzi Signed-off-by: Linus Torvalds commit d48eb2331595224ffe89665e79721d44b40bb047 Author: Davide Libenzi Date: Fri May 18 12:02:33 2007 -0700 eventfd use waitqueue lock ... The eventfd was using the unlocked waitqueue operations, but it was using a different lock, so poll_wait() would race with it. This makes eventfd directly use the waitqueue lock. Signed-off-by: Davide Libenzi Signed-off-by: Linus Torvalds commit 32f9306b161a5e0c892132f7227f36de94090289 Author: Christoph Lameter Date: Fri May 18 00:36:43 2007 -0700 slub: another slabinfo fix The slab manipulation functions should not be triggered by slabs that are unresovable in the subset of slabs selected on the command line. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 223a10a98135da38d3668973d72cdffb1ced4b7d Author: Oleg Nesterov Date: Fri May 18 00:36:42 2007 -0700 revert "cancel_delayed_work: use del_timer() instead of del_timer_sync()" As pointed out by Jarek Poplawski, the patch [WORKQUEUE]: cancel_delayed_work: use del_timer() instead of del_timer_sync() commit: 071b638689464c6b39407025eedd810d5b5e6f5d was wrong, it was merged by mistake after that. From the changelog: after this patch: ... delayed_work_timer_fn->__queue_work() in progress. The latter doesn't differ from the caller's POV, it does make a difference if the caller calls flush_workqueue() after cancel_delayed_work(), in that case flush_workqueue() can miss this work_struct. Signed-off-by: Oleg Nesterov Cc: Jarek Poplawski Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6c5d736af6bc71cebc017e4001ec5efff1ee116 Author: David S. Miller Date: Fri May 18 02:07:50 2007 -0700 [IPV4]: Remove IPVS icmp hack from route.c for now. Revert: 2d771cd86d4c3af26f34a7bcdc1b87696824cad9 This is dangerous if enabled and a better solution to the problem is being worked on. Signed-off-by: David S. Miller commit 29059d12e0c7f349aca6993acac20c5efbe13b81 Author: Herbert Xu Date: Fri May 18 16:25:19 2007 +1000 [CRYPTO] tcrypt: Add missing error check The return value of crypto_hash_final isn't checked in test_hash_cycles. This patch corrects this. Thanks to Eric Sesterhenn for reporting this. Signed-off-by: Herbert Xu commit 03983ab858ae6aea273060277c9b290498340047 Author: David S. Miller Date: Thu May 17 22:55:26 2007 -0700 [SPARC64]: Fix sched_clock() et al. SPARC64_NSEC_PER_CYC_SHIFT was set too high. Signed-off-by: David S. Miller commit b46522394dde7341a5253658096f354b65cbd90d Author: Linus Torvalds Date: Thu May 17 20:18:11 2007 -0700 Revert "[PATCH] x86: Drop cc-options call for all options supported in gcc 3.2+" This reverts commit c8fdd247255a3a027cd9f66dcf93e6847d1d2f85. It turns out the kernel was correct, and the gcc complaint was a gcc bug. The preferred stack boundary is expressed not in bytes, but in the the log2() of the preferred boundary, so "-mpreferred-stack-boundary=2" is in fact exactly what we want, but a gcc that is compiled for x86-64 will consider it an error (because the 64-bit calling sequence says that the stack should be 16-byte aligned) even if we are then using "-m32" to generate 32-bit code. Noted-by: Mikulas Patocka Cc: Jan Hubicka Acked-by: Andi Kleen Signed-off-by: Linus Torvalds commit d158325e407864793c5b0fbc85c74702753333b9 Author: Herbert Xu Date: Fri May 18 13:17:22 2007 +1000 [CRYPTO] padlock: Make CRYPTO_DEV_PADLOCK a tristate again Turning it into a boolean was unnecessary and caused ALGAPI to be pinned down as a boolean to. This patch makes it a tristate again. Signed-off-by: Herbert Xu commit 8fd7d1b16ea0e1b3b0823ed91b58993d6c6a1cc6 Author: Tejun Heo Date: Thu May 17 13:37:12 2007 +0200 sata_via: pcim_iomap_regions() conversion missed BAR5 pcim_iomap_regions() conversion missed BAR5. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d9aca22cf443f5ed77d15a320abbab055ae4a976 Author: Tejun Heo Date: Thu May 17 16:43:26 2007 +0200 libata: remove libata.spindown_compat With STANDBYDOWN tracking added, libata.spindown_compat isn't necessary anymore. If userspace shutdown(8) issues STANDBYNOW, libata warns. If userspace shutdown(8) doesn't issue STANDBYNOW, libata does the right thing. Userspace can tell whether kernel supports spindown by testing whether sysfs node manage_start_stop exists as before. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1daf9ce74e0e0ef8ffde800ab495339458c3375f Author: Tejun Heo Date: Thu May 17 13:13:57 2007 +0200 sata_nv: fix fallout of devres conversion As with all other drivers, sata_nv's hpriv is allocated with devm_kzalloc() and there's no need to free it explicitly. Kill nv_remove_one() which incorrectly used kfree() instead of devm_kfree() and use ata_pci_remove_one() directly. Original fix is from Peer Chen. Signed-off-by: Tejun Heo Cc: Peer Chen Signed-off-by: Jeff Garzik commit 074b8ba3863dd168befdba6c9115e990349a6755 Author: Peer Chen Date: Thu May 10 22:48:49 2007 -0700 drivers/ata: remove the wildcard from sata_nv driver Because nvidia SATA controllers onward base on AHCI, so wildcard in sata_nv driver is unnecessary. Also the wildcard sometimes cause sata_nv driver to be loaded for AHCI controllers,which is not as expected. Signed-off-by: Peer Chen Cc: Tejun Heo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit e94bd23f67c87011f012f26ca0af3fcf6878eeac Author: Auke Kok Date: Wed May 16 01:49:46 2007 -0700 e1000: Fix msi enable leak on error, don't print error message, cleanup pci_enable_msi failure is a normal event so we should not print any error. Going over the code I spotted a missing pci_disable_msi() leak when irq allocation fails. The whole code also needed a cleanup, so I combined the two different calls to pci_request_irq into a single call making this look a lot better. All #ifdef CONFIG_PCI_MSI's have been removed. Compile tested with both CONFIG_PCI_MSI enabled and disabled. Signed-off-by: Auke Kok Cc: H. Peter Anvin Signed-off-by: Jeff Garzik commit fb136c070bfdde11dc79758674f54fb26bba1a2f Author: Auke Kok Date: Thu May 17 15:29:07 2007 -0700 ixgb: don't print error if pci_enable_msi() fails, cleanup minor leak pci_enable_msi calls can fail for normal operational reasons. Driver should not print an error message in that case. Fix a leak that leaves msi enabled if pci_request_irq fails. We can remove CONFIG_PCI_MSI ifdefs alltogether Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 4a79a04e4c0aa06b556b7d52bfb31c05fbb05616 Author: Mithlesh Thukral Date: Thu May 17 06:52:25 2007 -0700 NetXen: Fix NetXen driver ping on system-p NetXen: Fix for driver on System-p This patch will fix a ping issue on system-p Signed-off by: Milan Bag Signed-off by: Adhiraj Joshi Signed-by: Mithlesh Thukral Signed-off-by: Jeff Garzik commit 98739407c529899820135b1fba87ccd1a411edda Author: Christoph Hellwig Date: Wed May 16 16:58:00 2007 -0500 spidernet: node-aware skbuff allocation Spidernet was the driver I original did all the node-aware netdevice allocation for, but after a year it still hasn't hit mainline. Signed-off-by: Christoph Hellwig Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 3b6330ce2a3e1f152f79a6203f73d23356e243a7 Author: Scott Wood Date: Wed May 16 15:06:59 2007 -0500 gianfar: Add I/O barriers when touching buffer descriptor ownership. The hardware must not see that is given ownership of a buffer until it is completely written, and when the driver receives ownership of a buffer, it must ensure that any other reads to the buffer reflect its final state. Thus, I/O barriers are added where required. Without this patch, I have observed GCC reordering the setting of bdp->length and bdp->status in gfar_new_skb. Hardware reordering was also theoretically possible. Signed-off-by: Scott Wood Signed-off-by: Jeff Garzik commit dbf2e8585971f2a8b1f60a188dc245fd2f8f81b3 Author: Eugene Surovegin Date: Wed May 16 12:01:05 2007 -0700 ibm_emac: fix link speed detection change Fix link speed detection change. Thanks to Stefan Roese for finding this bug. CC: Stefan Roese Signed-off-by: Eugene Surovegin Signed-off-by: Jeff Garzik commit 5bb96e9f2434b49a5b8f135f2a384974aa73db51 Author: Eugene Surovegin Date: Wed May 16 11:59:48 2007 -0700 ibm_emac: improved PHY support Original patch is from Jeff Haran with my minor style fixes. His comments follow: The first problem was in the function that configures the PHY for autonegotiation, genmii_setup_aneg(). The original code does a read/modify/write of the autonegotiation advertizement register (reg 4), followed by a read/modify/write of the control register (reg 0). While the original code follows the proper procedure as per reading the IEEE specs, what I found is that on at least one PHY model (National DP83843) the read of the control register comes back with the soft reset bit set (bit 15). Because of the read/modify/write operation, this causes the write to write a 1 back to the reset bit, which initiates a software reset of the PHY. This software reset causes the PHY to return to its power up state which advertizes all modes of operation, thus negating the write to the autoneg advertizement register. The modification is to spin reading the control register until the soft reset bit is clear before doing the modify/write. The second problem was in the function that configures the PHY for forced operation, genmii_setup_forced(). The original code initiates a software reset operation via a write of a 1 to bit 15 of the control register (reg 0), but then proceeds to do a second write to that same register without waiting until that reset bit is cleared by the PHY itself (which according to the IEEE specs indicates that the PHY reset is complete). This is a violation of how one is supposed to use this software reset feature of these PHYs and I believe was the cause of mysterious, difficult to reproduce link failures that we've observed on some of our systems that use this driver. The fix is to modify the function so that it spins waiting for the reset bit to clear after doing the soft reset and before doing the subsequent write. Signed-off-by: Jeff Haran CC: Benjamin Herrenschmidt Signed-off-by: Eugene Surovegin Signed-off-by: Jeff Garzik commit 0ec6d95053885055a50d973b3a3906905a78a8bf Author: Eugene Surovegin Date: Wed May 16 11:57:37 2007 -0700 ibm_emac: fix section mismatch warnings Fix "Section mismatch" warnings Signed-off-by: Eugene Surovegin Signed-off-by: Jeff Garzik commit bb33808d282a48803dcb6070ee1547d221669114 Author: Christoph Hellwig Date: Wed May 16 14:59:04 2007 +0200 small netdevices.txt fix Signed-off-by: Christoph Hellwig Signed-off-by: Jeff Garzik commit 50432cb534b566c4fd9e371fb37464a65ccd2391 Author: Stephen Hemminger Date: Mon May 14 12:38:15 2007 -0700 sky2: memory barriers change Do some memory barrier changes for safety/perfomance: Don't need read after update to index, mmiowb() followed by read at end of irq is sufficient. Signed-off-by: Stephn Hemminger Signed-off-by: Jeff Garzik commit 84787e3fc38a4847e5d75388d5a7fb3cf6bd7834 Author: Stephen Hemminger Date: Mon May 14 12:38:14 2007 -0700 sky2: remove dual port workaround This workaround was added to deal with NAPI core and how it affected dual port shared polling. It turned out not to be necessary. Stopping device 0 only doesn't stop NAPI from working completely after that. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a3caeada948535f126e407457e15f2633ee7168a Author: Stephen Hemminger Date: Mon May 14 12:38:13 2007 -0700 sky2: MIB counter overflow handling Make sure that if we ever get a MIB counter overflow interrupt (normally masked off), that the IRQ is cleared. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3225b919036a3ec2e96bb36b7a4fd64c43fdbe84 Author: Stephen Hemminger Date: Mon May 14 12:38:12 2007 -0700 sky2: keep track of receive alloc failures When driver can't allocate receive buffer it drops incoming packet. Keep a counter. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 53419c68517ee296f737cdc0acaca6eb1ae23aeb Author: Stephen Hemminger Date: Mon May 14 12:38:11 2007 -0700 sky2: PHY register settings Align the PHY setup of the sky2 driver with the vendor sk98lin (10.0.4.3) driver. The PHY register settings are mostly black magic, even with access to the documentation it isn't clear what the right values are. The changes are mostly comments, the code change only affects the Yukon FE (100 mbit only) version. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit abc368a17c00b3c7837498cdb4e166cfdeefbe98 Author: Stephen Hemminger Date: Mon May 14 12:38:10 2007 -0700 sky2: remove Gigabyte 88e8056 restriction The problems with Gigabyte motherboards are system configuration dependent. Since it works fine for some users, it doesn't make sense to deprive them. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d739437207064cdcea8f9c81442284106cbcb67f Author: Dave Jones Date: Thu May 17 15:02:21 2007 -0700 [IPV4]: Correct rp_filter help text. As mentioned in http://bugzilla.kernel.org/show_bug.cgi?id=5015 The helptext implies that this is on by default. This may be true on some distros (Fedora/RHEL have it enabled in /etc/sysctl.conf), but the kernel defaults to it off. Signed-off-by: Dave Jones Signed-off-by: David S. Miller commit 2ff011efa4cc591ed563241bae3d60bc0eaac210 Author: David S. Miller Date: Thu May 17 00:07:47 2007 -0700 [TCP]: TCP_CONG_YEAH requires TCP_CONG_VEGAS These two congestion control modules share code. Signed-off-by: David S. Miller commit a02ba041664171563e6418ccdf3b363d32d6a43b Author: Stephen Hemminger Date: Thu May 17 00:04:18 2007 -0700 [TCP] slow start: Make comments and code logic clearer. Add more comments to describe our version of tcp_slow_start(). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4ce61d1c7a8ef4c1337fa983a3036d4010e3c19e Author: Satyam Sharma Date: Wed May 16 23:50:16 2007 -0700 [BLUETOOTH]: Fix locking in hci_sock_dev_event(). We presently use lock_sock() to acquire a lock on a socket in hci_sock_dev_event(), but this goes BUG because lock_sock() can sleep and we're already holding a read-write spinlock at that point. So, we must use the non-sleeping BH version, bh_lock_sock(). However, hci_sock_dev_event() is called from user context and hence using simply bh_lock_sock() will deadlock against a concurrent softirq that tries to acquire a lock on the same socket. Hence, disabling BH's before acquiring the socket lock and enable them afterwards, is the proper solution to fix socket locking in hci_sock_dev_event(). Signed-off-by: Satyam Sharma Signed-off-by: Marcel Holtmann Signed-off-by: Jiri Kosina Signed-off-by: David S. Miller commit 689d79469b64662440a93ffbd1cbf994510bcbf6 Author: David S. Miller Date: Wed May 16 00:30:09 2007 -0700 [NET]: Fix BMSR_100{HALF,FULL}2 defines in linux/mii.h Noticed by Matvejchikov Ilya. Signed-off-by: David S. Miller commit 723e98b79c5f2dd97ce559506362844b1a086f80 Author: Jarek Poplawski Date: Tue May 15 22:46:18 2007 -0700 [NET]: lockdep classes in register_netdevice After initializing dev->_xmit_lock register_netdevice() sets lockdep class according to dev->type. Idea of this patch - by David Miller. Reported & tested by: "Yuriy N. Shkandybin" Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 0479ea0eab197b3e5d4c731f526c02e5e3fbfbd0 Author: David Woodhouse Date: Thu May 17 18:48:12 2007 +0800 Fix incorrect prototype for ipxrtr_route_packet() The function ipxrtr_route_packet() takes a 'len' argument of type size_t. However, its prototype in af_ipx.c incorrectly suggests that the corresponding argument is of type 'int' instead. Discovered by building with --combine and letting the compiler see it all at once. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit b5b82df6f461e66af821bff5b51f336af92d96b6 Author: David Woodhouse Date: Thu May 17 14:27:39 2007 +0800 NS16550A: Restore HS settings in EXCR2 on resume After a suspend/resume cycle, the UART may have been reset into low-speed mode -- either because it's actually been reset, or because the firmware pokes at the old-style divisor registers. If we detected it as a NS16550A SuperIO chip in the first place and set baud_base to 921600, then we should do so again in the resume path. This patch adds that code to serial8250_resume_port(), and also makes serial8250_resume() actually call serial8250_resume_port() for each port instead of just calling uart_resume_port() directly. And thus fixes serial port operation after suspend/resume. It also fixes a bogus comment where we write the EXCR2 register with a comment saying /* EXCR1 */ Signed-off-by: David Woodhouse Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit c97a9e10eaee328e6eea9f76acf7bacd7d48ef56 Author: Nick Piggin Date: Wed May 16 22:11:21 2007 -0700 mm: more rmap checking Re-introduce rmap verification patches that Hugh removed when he removed PG_map_lock. PG_map_lock actually isn't needed to synchronise access to anonymous pages, because PG_locked and PTL together already do. These checks were important in discovering and fixing a rare rmap corruption in SLES9. Signed-off-by: Nick Piggin Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea125892a17f43919c726777ed1e4929d41e7984 Author: Christoph Lameter Date: Wed May 16 22:11:21 2007 -0700 Fix page allocation flags in grow_dev_page() grow_dev_page() simply passes GFP_NOFS to find_or_create_page. This means the allocation of radix tree nodes is done with GFP_NOFS and the allocation of a new page is done using GFP_NOFS. The mapping has a flags field that contains the necessary allocation flags for the page cache allocation. These need to be consulted in order to get DMA and HIGHMEM allocations etc right. And yes a blockdev could be allowing Highmem allocations if its a ramdisk. Cc: Hugh Dickins Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d98a690f58e0d6ecf424b7ca84488475cf87bd9 Author: Rafael J. Wysocki Date: Wed May 16 22:11:19 2007 -0700 swsusp: fix sysfs interface The sysfs files /sys/power/disk and /sys/power/state do not work as documented, since they allow the user to write only a few initial characters of the input string to trigger the option (eg. 'echo pl > /sys/power/disk' activates the platform mode of hibernation). Fix it. Special thanks to Peter Moulder for pointing out the problem. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7925409e202a41176b729671eab6e610a54153cd Author: Jan Kara Date: Wed May 16 22:11:19 2007 -0700 circular locking dependency found in QUOTA OFF i_mutex on quota files is special. Unlike i_mutexes for other inodes it is acquired under dqonoff_mutex. Tell lockdep about this lock ranking. Also comment and code in quota_sync_sb() seem to be bogus (as i_mutex for quota file can be acquired under dqonoff_mutex). Move truncate_inode_pages() call under dqonoff_mutex and save some problems with races... Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb49b32fece7910fbb02a6934bca4495596f6c8c Author: Hugh Dickins Date: Wed May 16 22:11:18 2007 -0700 i386: don't check_pgt_cache in flush_tlb_mm No other architecture calls check_pgt_cache() from within flush_tlb_mm(), and i386 is already calling check_pgt_cache() from the usual places, tlb_finish_mmu() and cpu_idle() (the latter being odd, but not unusual). flush_tlb_mm() has no business to be freeing pages: remove that line, which sneaked in with slub's i386 support. Signed-off-by: Hugh Dickins Cc: Andi Kleen Acked-by: Christoph Lameter Acked-by: William Lee Irwin III Cc: David Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9f2875b7968453a852e1de5d3504fd2241e8989 Author: Nate Diller Date: Wed May 16 22:11:17 2007 -0700 ecryptfs: use zero_user_page Use zero_user_page() instead of open-coding it. Signed-off-by: Nate Diller Cc: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71ce92f3fa442069670a52fa6230a6064c4517b3 Author: Dan Aloni Date: Wed May 16 22:11:16 2007 -0700 make sysctl/kernel/core_pattern and fs/exec.c agree on maximum core filename size Make sysctl/kernel/core_pattern and fs/exec.c agree on maximum core filename size and change it to 128, so that extensive patterns such as '/local/cores/%e-%h-%s-%t-%p.core' won't result in truncated filename generation. Signed-off-by: Dan Aloni Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc88d5d4e18add7283770ead2734b601c50b3e2a Author: wendy xiong Date: Wed May 16 22:11:16 2007 -0700 icom: add new sub-device-id to support new adapter This patch add new sub-device-id to support new adapter and changed the interrupt irq number for unsigned char to unsigned int. [akpm@osdl.org: fix whitespace in device table] Signed-off by: Wendy Xiong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e40659c5cae2397d6a329e652aa2d4f1c9f7de2a Author: David Brownell Date: Wed May 16 22:11:15 2007 -0700 rtc kconfig clarification Make drivers/rtc/Kconfig be clearer about what the various "interfaces" actually mean, by showing path names. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 558a40f708bbfb1b260d605cca6c3b9d2c86453e Author: David Brownell Date: Wed May 16 22:11:14 2007 -0700 rtc-omap build fix Fix typo which breaks build. How did that happen? Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83c6590cb83d3106df12fee36ac2a261951b8c88 Author: David Brownell Date: Wed May 16 22:11:13 2007 -0700 gpio interface loosens call restrictions Loosen gpio_{request,free}() and gpio_direction_{in,out}put() call context restrictions slightly, so a common idiom is no longer an error: board init code setting up spinlock-safe GPIOs before tasking is enabled. The issue was caught by some paranoid code with might_sleep() checks. The legacy platform-specific GPIO interfaces stick to spinlock-safe GPIOs, so this change reflects current implementations and won't break anything. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 621e59a771f310358ade8f14cb745d5d5f1c410e Author: Randy Dunlap Date: Wed May 16 22:11:12 2007 -0700 docbook: make kernel-locking table readable Andi Kleen pointed out to me that the kernel locking cheat sheet table entries are unreadable. Make table entries smaller so that pdf and ps output is readable (columns were being overwritten and garbled) by using abbreviations. This allows the tables to fit on one page cleanly. Add a Legend for the abbreviations: SLIS: spin_lock_irqsave SLI: spin_lock_irq SL: spin_lock SLBH: spin_lock_bh DI: down_interruptible Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dd1a32968d5e4cc61d4f7e3dc396ed0faca6984 Author: Randy Dunlap Date: Wed May 16 22:11:12 2007 -0700 parport: mailing list is subscribers-only linux-parport is subscribers-only: Your mail to 'Linux-parport' with the subject Re: [QUESTION] parallel console configuration Is being held until the list moderator can review it for approval. The reason it is being held: Post by non-member to a members-only list Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3dfd2964ea86ae65f511b10d62ea54d46db3708 Author: Oleg Nesterov Date: Wed May 16 22:11:11 2007 -0700 make freezeable workqueues singlethread It is a known fact that freezeable multithreaded workqueues doesn't like CPU_DEAD. We keep them only for the incoming CPU-hotplug rework. Sadly, we can't just kill create_freezeable_workqueue() right now, make them singlethread. Signed-off-by: Oleg Nesterov Cc: "Rafael J. Wysocki" Cc: Gautham R Shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1a4849c419337f649c6633219b555eb4d4d955a Author: Gerd Hoffmann Date: Wed May 16 22:11:09 2007 -0700 Refine SCREEN_INFO sanity check for vgacon initialization Refine SCREEN_INFO sanity check for vgacon initialization. Checking video mode field only to see whenever SCREEN_INFO is initialized is not enougth, in some cases it is zero although a vga card is present. Lets additionally check cols and lines. Signed-off-by: Gerd Hoffmann Cc: Rusty Russell Cc: Andi Kleen Cc: Alan Cc: Ingo Molnar Acked-by: Eric W. Biederman Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79974a0e4c6be6e9a3717b4c5a5d5c44c36b1653 Author: Heiko Carstens Date: Wed May 16 22:11:09 2007 -0700 Let smp_call_function_single return -EBUSY on UP All architectures that have an implementation of smp_call_function_single let it return -EBUSY if it is asked to execute func on the current cpu. (akpm: except for x86_64). Therefore the UP version must always return -EBUSY. [akpm@linux-foundation.org: build fix] Signed-off-by: Heiko Carstens Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8317f14b60c02c69cf7f594e2aabc8a3fdc9618d Author: Heiko Carstens Date: Wed May 16 22:11:08 2007 -0700 simplify compat_sys_timerfd Just thought this is easier to read. Acked-by: Davide Libenzi Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d55e2ca87321b65387d3c52dd38128b3fe6723b0 Author: Benjamin Herrenschmidt Date: Wed May 16 22:11:07 2007 -0700 Make __vunmap static __vunmap doesn't seem to be used outside of mm/vmalloc.c, and has no prototype in any header so let's make it static Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df652fe173c12d29960f3a8eafce29041e86b942 Author: Bernhard Walle Date: Wed May 16 22:11:06 2007 -0700 i386/x86-64: fix section mismatch WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text:mtrr_bp_init from .text between 'id entify_cpu' (at offset 0x6571) and 'IRQ0x20_interrupt' It's because identify_cpu() which is __cpuinit calls mtrr_bp_init() which is __init(). __cpuinit() expands to nothing if CONFIG_HOTPLUG_CPU=y and so the call is illegal. Signed-off-by: Bernhard Walle Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f363d16fbb9374c0bd7f2757d412c287169094c9 Author: Aaron Durbin Date: Wed May 16 22:11:06 2007 -0700 acpi: fix potential call to a freed memory section. Strip __cpuinit[data] from Node <-> PXM routines and supporting data structures. Also make pxm_to_node_map and node_to_pxm_map local to the numa acpi module. This fixes a bug triggered by the following conditions: - boot on a machine with a SLIT table defined - kernel is configured w/ CONFIG_HOTPLUG_CPU=n - cat /sys/devices/system/node/node*/distance This will cause an oops by calling into a freed memory section. In particular, on x86_64, __node_distance calls node_to_pxm(). Signed-off-by: Aaron Durbin Cc: Len Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0aa817f078b655d0ae36669169d73a5c8a388016 Author: Christoph Lameter Date: Wed May 16 22:11:01 2007 -0700 Slab allocators: define common size limitations Currently we have a maze of configuration variables that determine the maximum slab size. Worst of all it seems to vary between SLAB and SLUB. So define a common maximum size for kmalloc. For conveniences sake we use the maximum size ever supported which is 32 MB. We limit the maximum size to a lower limit if MAX_ORDER does not allow such large allocations. For many architectures this patch will have the effect of adding large kmalloc sizes. x86_64 adds 5 new kmalloc sizes. So a small amount of memory will be needed for these caches (contemporary SLAB has dynamically sizeable node and cpu structure so the waste is less than in the past) Most architectures will then be able to allocate object with sizes up to MAX_ORDER. We have had repeated breakage (in fact whenever we doubled the number of supported processors) on IA64 because one or the other struct grew beyond what the slab allocators supported. This will avoid future issues and f.e. avoid fixes for 2k and 4k cpu support. CONFIG_LARGE_ALLOCS is no longer necessary so drop it. It fixes sparc64 with SLAB. Signed-off-by: Christoph Lameter Signed-off-by: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ec0974210fe1b7c0618ad6e39a882a4237d7de2 Author: Christoph Lameter Date: Wed May 16 22:11:00 2007 -0700 SLUB: Simplify debug code Consolidate functionality into the #ifdef section. Extract tracing into one subroutine. Move object debug processing into the #ifdef section so that the code in __slab_alloc and __slab_free becomes minimal. Reduce number of functions we need to provide stubs for in the !SLUB_DEBUG case. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a35afb830f8d71ec211531aeb9a621b09a2efb39 Author: Christoph Lameter Date: Wed May 16 22:10:57 2007 -0700 Remove SLAB_CTOR_CONSTRUCTOR SLAB_CTOR_CONSTRUCTOR is always specified. No point in checking it. Signed-off-by: Christoph Lameter Cc: David Howells Cc: Jens Axboe Cc: Steven French Cc: Michael Halcrow Cc: OGAWA Hirofumi Cc: Miklos Szeredi Cc: Steven Whitehouse Cc: Roman Zippel Cc: David Woodhouse Cc: Dave Kleikamp Cc: Trond Myklebust Cc: "J. Bruce Fields" Cc: Anton Altaparmakov Cc: Mark Fasheh Cc: Paul Mackerras Cc: Christoph Hellwig Cc: Jan Kara Cc: David Chinner Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5577bd8a85c8b7643a241789b14fafa9c8a6c7db Author: Christoph Lameter Date: Wed May 16 22:10:56 2007 -0700 SLUB: Do our own flags based on PG_active and PG_error The atomicity when handling flags in SLUB is not necessary since both flags used by SLUB are not updated in a racy way. Flag updates are either done during slab creation or destruction or under slab_lock. Some of these flags do not have the non atomic variants that we need. So define our own. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eefaca9c3246f3daf56e7ed02987f79abcee7087 Author: Christoph Lameter Date: Wed May 16 22:10:55 2007 -0700 SLUB: slabinfo fixes Align the output of % with K/M/G of sizes. Check for empty NUMA information to avoid segfault on !NUMA. -r should work directly not only if we match a single slab without additional options. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ade3aff25fb2dce76e2a9b53e1334bd0a174f739 Author: Andrew Morton Date: Wed May 16 22:10:54 2007 -0700 slub: fix handling of oversized slabs I'm getting zillions of undefined references to __kmalloc_size_too_large on alpha. For some reason alpha is building out-of-line copies of kmalloc_slab() into lots of compilation units. It turns out that gcc just isn't smart enough to work out that __builtin_contant_p(size)==true implies that __builtin_contant_p(index)==true. So let's give it a bit of help. Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b44f7a5b5078d737b3f5914978aabb761254840 Author: Christoph Lameter Date: Wed May 16 22:10:53 2007 -0700 slab: warn on zero-length allocations slub warns on this, and we're working on making kmalloc(0) return NULL. Let's make slab warn as well so our testers detect such callers more rapidly. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b6f0750457db1f573eb6226960a432da3be8fe2 Author: Christoph Lameter Date: Wed May 16 22:10:53 2007 -0700 SLUB: Define functions for cpu slab handling instead of using PageActive Use inline functions to access the per cpu bit. Intoduce the notion of "freezing" a slab to make things more understandable. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ca12ee549f7837b8a685dddc9515f9fc28434ee Author: Christoph Lameter Date: Wed May 16 22:10:52 2007 -0700 SLAB: Move two remaining SLAB specific definitions to slab_def.h Two definitions remained in slab.h that are particular to the SLAB allocator. Move to slab_def.h Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fbf09a09e8aa50c56e2c6dfacc27eff93ff4c93 Author: Christoph Lameter Date: Wed May 16 22:10:51 2007 -0700 SLUB: Remove depends on EXPERIMENTAL and !ARCH_USES_SLAB_PAGE_STRUCT No arch sets ARCH_USES_SLAB_PAGE_STRUCT anymore. Remove the experimental dependency as well since we want to have it as a real alternative to SLAB. It all comes down to killing a single line from init/Kconfig. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c59def9f222d44bb7e2f0a559f2906191a0862d7 Author: Christoph Lameter Date: Wed May 16 22:10:50 2007 -0700 Slab allocators: Drop support for destructors There is no user of destructors left. There is no reason why we should keep checking for destructors calls in the slab allocators. The RFC for this patch was discussed at http://marc.info/?l=linux-kernel&m=117882364330705&w=2 Destructors were mainly used for list management which required them to take a spinlock. Taking a spinlock in a destructor is a bit risky since the slab allocators may run the destructors anytime they decide a slab is no longer needed. Patch drops destructor support. Any attempt to use a destructor will BUG(). Acked-by: Pekka Enberg Acked-by: Paul Mundt Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afc0cedbe9138e3e8b38bfa1e4dfd01a2c537d62 Author: Nick Piggin Date: Wed May 16 22:10:49 2007 -0700 slob: implement RCU freeing The SLOB allocator should implement SLAB_DESTROY_BY_RCU correctly, because even on UP, RCU freeing semantics are not equivalent to simply freeing immediately. This also allows SLOB to be used on SMP. Signed-off-by: Nick Piggin Acked-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccd308f09a6636d86dbe62bab892b96711feee67 Author: Stephen Rothwell Date: Thu May 17 11:22:15 2007 +1000 [POWERPC] Remove build warnings in windfarm_core drivers/macintosh/windfarm_core.c: In function 'wf_register_control': drivers/macintosh/windfarm_core.c:219: warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result drivers/macintosh/windfarm_core.c: In function 'wf_register_sensor': drivers/macintosh/windfarm_core.c:329: warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result Signed-off-by: Stephen Rothwell Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 60e417536bca8988d22ea1cc20a634ffa67bb2a8 Author: Josh Boyer Date: Thu May 17 04:51:37 2007 +1000 [POWERPC] Pass per-file CFLAGs for platform specific op codes As a result of compiling all of the wrapper files for every platform now, the kernel build can fail for toolchains that don't support various op codes by default. An example of this building a 7xx platform with the ELD4.0 toolchain, is below: /tmp/ccYjhJoL.s: Assembler messages: /tmp/ccYjhJoL.s:42: Error: Unrecognized opcode: `mtdcr' /tmp/ccYjhJoL.s:43: Error: Unrecognized opcode: `mfdcr' make[1]: *** [arch/powerpc/boot/44x.o] Error 1 The following patch introduces additional CFLAGS for the 4xx specific files and fixes the kernel compile. Signed-off-by: Josh Boyer Signed-off-by: Paul Mackerras commit 5b825831858b92da2417ecb3e3bbde594e5f7c91 Author: Jon Tollefson Date: Thu May 17 04:43:02 2007 +1000 [POWERPC] Correct #endif comment Fix up comment on two #endifs to match their #ifs. Signed-off-by: Jon Tollefson ---- hash_utils_64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Paul Mackerras commit 9a6b50703e95b638f610a65ffcc5faf4356f73c9 Author: Segher Boessenkool Date: Wed May 16 23:12:17 2007 +1000 [POWERPC] Fix ppc_rtas_progress_show() Fixes the warning arch/powerpc/kernel/rtas-proc.c: In function 'ppc_rtas_progress_show': arch/powerpc/kernel/rtas-proc.c:382: warning: the address of 'progress_led' will always evaluate as 'true' by fixing the code to do what it presumably is meant to do. Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 67ccd2fcd42333493a33993312c76fb2d4c2a2d6 Author: Segher Boessenkool Date: Wed May 16 22:49:22 2007 +1000 [POWERPC] Fix sed command lines for zlib source construction Not every sed understands \+ so use the more portable * instead. Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 8995ac8702737147115e1c75879a1a2d75627b9e Author: Segher Boessenkool Date: Wed May 16 22:34:38 2007 +1000 [POWERPC] Specify GNUTARGET on $(AR) invocations Without this, some versions of GNU ar fail to create an archive index if the object files it is packing together are of a different object format than ar's default format (for example, binutils compiled to default to 64-bit, with 32-bit objects). Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 847f5976f90d5637a86a826c1c594091d08f3156 Author: Benjamin Herrenschmidt Date: Wed May 16 16:57:24 2007 +1000 [POWERPC] Make sure device node type/name is not NULL on hot-added nodes Our device-tree unflattening code makes sure the name and type fields of a device-node are not NULL. However, the code for dynamically adding devices nodes which is used for pSeries hotplug for example didn't do it, potentially causing crashes in some code that assume it can always do things like strcmp on those. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c72ea777d4e51435388fbd863c813a19635fa8ef Author: David Gibson Date: Wed May 16 13:48:50 2007 +1000 [POWERPC] Small fixes for the Ebony device tree This patch corrects a number of minor errors in the Ebony device tree: - Missing (given as 0) cache sizes are added to the CPU node - device_type properties are removed from nodes which don't have a reasonably well defined device_type binding. This does require a very small code change to locate the busses to be probed for of_platform devices by 'compatible' instead of 'device_type'. - A node is added for the SRAM controller - The unit address of the small-flash node is adjusted to correctly reflect the reg property. - device_type values for the MAL and ZMII are updated to reflected more up-to-date versions of the binding. - An incorrect offset in the partition map for the large-flash node is corrected. - Some redundant values, already commented out are removed entirely. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit f7c0d13b9430c4bb4b6f8507ed19d7cc7971dfa5 Author: Stephen Rothwell Date: Wed May 16 13:21:09 2007 +1000 [POWERPC] Fix warning on UP arch/powerpc/platforms/pseries/pseries.h:24: warning: return type defaults to 'int' arch/powerpc/platforms/pseries/pseries.h:25: warning: return type defaults to 'int' arch/powerpc/platforms/pseries/pseries.h:24: warning: control reaches end of non-void function arch/powerpc/platforms/pseries/pseries.h:25: warning: control reaches end of non-void function Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 0453c62c8035f1a8a6e331b235c02ccdcb4e8910 Author: Christian Krafft Date: Wed May 16 10:33:21 2007 +1000 [POWERPC] cell_defconfig: Disable cpufreq and pmi Cpufreq using pmi is broken by a dependency issue, that will be fixed in a seperate patch. Bare-metal cpufreq is broken by hardware limitations. As it was the only user, pmi is disabled as well. Signed-off-by: Christian Krafft Signed-off-by: Paul Mackerras commit de821204dbd0a967f77213daf7b89070a65e7523 Author: Benjamin Herrenschmidt Date: Tue May 15 16:19:36 2007 +1000 [POWERPC] Fix IO space on PCI buses created from of_platform This changes the way of_platform_pci creates PCI host bridges such that it uses request_phb_iospace() for mapping the IO ports, instead of using the dynamic hotplug stuff. That guarantees the IO space stays within the 2GB limit and thus doesn't break half of the legacy drivers around. Fixes a couple of warnings due to missing IO space while at it. This patch is a temporary workaround for 2.6.22 before a more complete rewrite of IO mappings is merged in 2.6.23 Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 017e3c53f116d6a0741a21624924528dc9f98418 Author: Benjamin Herrenschmidt Date: Tue May 15 14:16:26 2007 +1000 [POWERPC] Add spinlock to request_phb_iospace() request_phb_iospace() can be called from different CPUs at init time (at least with my next patch) and thus needs a spinlock. As for the next patch, this is a temporary workaround for 2.6.22 issues until my rewrite of IO mappings is ready (for 2.6.23) Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6a32d085ae71724edffa30fcd2045520a051cb14 Author: David Gibson Date: Tue May 15 12:40:23 2007 +1000 [POWERPC] Fix make rules for treeImage.initrd At present attempting to build treeImage.initrd.* boot images will fail, because make will select the treeImage.% rule which also matches instead of the correct and more specific treeImage.initrd.% rule. This patch corrects the problem by listing the more specific rule first. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit d16f1b648356d70ebbda2eb1b2af18a6816dacb1 Author: Olof Johansson Date: Tue May 15 06:59:12 2007 +1000 [POWERPC] Remove warning in mpic.c arch/powerpc/sysdev/mpic.c: In function 'mpic_request_ipis': arch/powerpc/sysdev/mpic.c:1445: warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 63df81ec3bc91cd894e3609b7267ed50df408ebd Author: Olof Johansson Date: Tue May 15 06:03:30 2007 +1000 [POWERPC] Update pasemi_defconfig Update pasemi_defconfig, add new relevant drivers. Take out CONFIG_PPC_PSERIES, it should't have been enabled in the first place. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 71efe45da9b520fd4621305f8fbcbdd74607f287 Author: Olof Johansson Date: Tue May 15 06:03:09 2007 +1000 [POWERPC] pasemi: CONFIG_GENERIC_TBSYNC no longer needed Current kernel implements proper TB sync, no need to keep GENERIC_TBSYNC enabled. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit cbb0503742de65a5931226b5b72830f650cf4947 Author: Stephen Rothwell Date: Mon May 14 14:36:28 2007 +1000 [POWERPC] Update iseries_defconfig Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 3692b9444b15ad12e5ec56ec77b1009bb75f8d42 Author: Stephen Rothwell Date: Mon May 14 13:50:33 2007 +1000 [POWERPC] Wire up some more syscalls signalfd, timerfd and eventfd Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 7c40542ffaa20e361f5f37d112aba41a725fc759 Author: David Gibson Date: Mon May 14 13:13:57 2007 +1000 [POWERPC] Fix bug adding properties with flatdevtree.c's ft_set_prop() ft_set_prop() from flatdevtree.c in the zImage wrapper will either replace an existing property in the flat device tree, or add a new property definiion if the given property isn't present. However, when adding properties, it adds the property definition immediately before the node's END_NODE tag, potentially after any subnode definitions for the node. This confuses the kernel flat tree parser in prom.c which assumes that all property definitions for a node come before all subnode definitions. This patch corrects ft_set_prop() so that it adds new properties before the first subnode, instead of before the END_NODE tag. Signed-off-by: David Gibson Acked-by: Scott Wood Acked-by: Mark A. Greer Signed-off-by: Paul Mackerras commit e3d67b663b5ededac1b2c552b4f0b4fbe94d7ac3 Author: David Gibson Date: Mon May 14 11:43:20 2007 +1000 [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error There are no actual implementations of fixup_bigphys_addr() in arch/powerpc, and with a 64-bit aware ioremap() and so forth, it should no longer be necessary. This patch removes the last dregs of fixup_bigphys_addr() from arch/powerpc. In fact, the only reason this hasn't caused link errors already is that nobody must have tried using one of the small number of drivers using io_remap_pfn_range() on one of the small number of platforms which are 32-bit but define CONFIG_PHYS_64BIT. Nonetheless this fixes a bug, and should go into 2.6.22. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 39d207036c76ff16650772b83fb1a12ab788ca26 Author: Christoph Hellwig Date: Tue May 15 23:10:34 2007 +1000 [POWERPC] viopath: Use a completion in some more places Signed-off-by: Christoph Hellwig Signed-off-by: Paul Mackerras commit 9d561ed46ea33c223def2eb8e2b09ea108a4d70b Author: Christoph Hellwig Date: Mon May 14 01:50:27 2007 +1000 [POWERPC] viopath: Use completion Use a completion instead of abusing a semaphore for hypervisor event completion in viopath. Signed-off-by: Christoph Hellwig Acked-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit e38e3458804019c3fe9b17998e05fd1cd480806d Author: Tony Breeds Date: Sun May 13 13:40:53 2007 +1000 [POWERPC] Fix Kconfig undefined symbol 'IBM_NEW_EMAC_ZMII' An allmodconfig on the current powerpc tree yields: arch/powerpc/platforms/44x/Kconfig:41:warning: 'select' used by config symbol '440GP' refers to undefined symbol 'IBM_NEW_EMAC_ZMII' Hide the select until the driver exists. Signed-off-by: Tony Breeds Signed-off-by: Paul Mackerras commit 5c1992f83304cf2d56934dd6c06709b96e1b0c81 Author: Kumar Gala Date: Tue May 15 16:12:27 2007 -0500 [POWERPC] Removed hardcoded phandles from dts Remove explicit phandles and move to using references that autogenerate the phandles when needed. Signed-off-by: Kumar Gala commit c0fabf7535f827cebf938ac5e44863089ae7eafd Author: Morten Banzon Date: Tue May 15 11:41:11 2007 -0700 [PPC] MCC2 missing in MPC826x device_list Adds the MCC2 device to the 826x device_list and fixed MCC1/MCC2 entries in all other PQ2 processors. Signed-off-by: Morten Banzon Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Kumar Gala commit 4da421d620fc104adf0b8b3841650c78f0e87b0a Author: Kumar Gala Date: Tue May 15 13:20:05 2007 -0500 [POWERPC] 85xx: Add device nodes for error reporting devices used by EDAC Adding memory-controller and l2-cache-controller entries to be used by EDAC as of_devices for MPC8541 CDS, MPC8544 DS, MPC8555 CDS, and MPC8568 MDS. Signed-off-by: Kumar Gala commit 50cf67075ba071e0532ccc657ad64cfbb2da3c7a Author: Dave Jiang Date: Thu May 10 10:03:05 2007 -0700 [POWERPC] 85xx: Add device nodes for error reporting devices used by EDAC Adding memory-controller and l2-cache-controller entries to be used by EDAC as of_devices for MPC8540 ADS, MPC8548 CDS, and MPC8560 ADS. Also fixed up the size of the PCI node on MPC8560 ADS. Signed-off-by: Dave Jiang Signed-off-by: Kumar Gala commit 1c2de47cd47daa033251dbb4a3643e7e87a681b0 Author: Timur Tabi Date: Mon May 14 11:31:26 2007 -0500 [POWERPC] Fix alignment problem in rh_alloc_align() with exact-sized blocks When an rheap is created, the caller can specify the alignment to use. In rh_alloc_align(), if a free block is found that is the exact size needed (including extra space for alignment), that configured alignment value is not used to align the pointer. Instead, the default alignment is used. If the default alignment is smaller than the configured alignment, then the returned value will not be aligned correctly. Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala commit 991eb43af989002d5c7f4a2ff2a6c806a912b51b Author: Kumar Gala Date: Mon May 14 17:11:58 2007 -0500 [POWERPC] Fix COMMON symbol warnings We get the following warnings in various ARCH=powerpc builds: WARNING: "ee_restarts" [arch/powerpc/kernel/built-in] is COMMON symbol WARNING: "fee_restarts" [arch/powerpc/kernel/built-in] is COMMON symbol WARNING: "htab_hash_searches" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "next_slot" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "mmu_hash_lock" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "primary_pteg_full" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "global_dbcr0" [arch/powerpc/kernel/built-in] is COMMON symbol Switch to moving local symbols (except mmu_hash_lock which is global) and space directive instead. Signed-off-by: Kumar Gala commit 40ebbcbf23d5592f58712fca2ab406ff818e2d65 Author: Dave Jiang Date: Thu Apr 12 13:34:55 2007 -0700 [POWERPC] Fix comment in booke_wdt The early kernel parameter is wdt and not wdt_enable. according to arch/powerpc/kernel/setup_32.c. Signed-off-by: Dave Jiang Signed-off-by: Kumar Gala commit 3d372548b4af1a3d0a40f3dde7af5389a30ce359 Author: James.Yang Date: Wed May 2 16:34:43 2007 -0500 [POWERPC] Remove CPU_FTR_NEED_COHERENT for 7448. Remove CPU_FTR_NEED_COHERENT for MPC7448 (and single-core MPC86xx). This prevents needlessly setting M=1 when not SMP. Signed-off-by: James.Yang Acked-by: Jon Loeliger Signed-off-by: Kumar Gala commit f4dcd3c229a0745aff7d6835ca7c45aaeb293714 Author: Becky Bruce Date: Thu May 10 10:13:04 2007 -0500 [POWERPC] Change include protections to ASM_POWERPC Change several headers in include/asm-powerpc that currently use some variation of ASM_PPC to use ASM_POWERPC instead. Signed-off-by: Becky Bruce Signed-off-by: Kumar Gala commit 43c0f3d25c602dc96b201ed81ffda0bc600ff969 Author: Christoph Lameter Date: Tue May 15 23:57:09 2007 -0700 Fix: find_or_create_page skips cpuset memory spreading. We call alloc_page where we should be calling __page_cache_alloc. __page_cache_alloc performs cpuset memory spreading. alloc_page does not. There is no reason that pages allocated via find_or_create should be exempt. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8382d2b9a7205fe1fb262f59237715a40c911880 Author: Andrew Morton Date: Tue May 15 23:57:08 2007 -0700 parport_pc needs dma-mapping.h alpha: drivers/parport/parport_pc.c: In function 'parport_pc_fifo_write_block_dma': drivers/parport/parport_pc.c:636: warning: implicit declaration of function 'dma_map_single' drivers/parport/parport_pc.c:637: error: 'DMA_TO_DEVICE' undeclared (first use in this function) drivers/parport/parport_pc.c:637: error: (Each undeclared identifier is reported only once drivers/parport/parport_pc.c:637: error: for each function it appears in.) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a4dd7783dfc62176a29cb349404180f24f46975 Author: Domen Puncer Date: Tue May 15 23:57:05 2007 -0700 spi: fix spidev for >sizeof(long)/32 devices find_first_zero_bit accepts number of bits, not longs. Signed-off-by: Domen Puncer Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb33ed6345d6156484f39089aa8b52f44ce76609 Author: David Howells Date: Tue May 15 23:57:04 2007 -0700 AFS: Fix afs_prepare_write() afs_prepare_write() should not mark a page up to date if it only partially fills it in, in expectation of the caller filling in the rest prior to calling commit_write(). commit_write(), however, should mark the page up to date. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1800782016fda6fbc9990a0227fec581070f23af Author: Hugh Dickins Date: Tue May 15 23:57:04 2007 -0700 slub: don't confuse ctor and dtor kmem_cache_create() was swapping ctor and dtor in calling find_mergeable(): though it caused no bug, and probably never would, even if destructors are retained; but fix it so as not to generate anxiety ;) Signed-off-by: Hugh Dickins Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1abd727ed7abf5c19e7d1760671475cbecbccb0e Author: Christoph Lameter Date: Tue May 15 23:57:03 2007 -0700 SLUB: It is legit to allocate a slab of the maximum permitted size Sorry I screwed up the comparison. It is only an error if we attempt to allocate a slab larger than the maximum allowed size. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faab83bbcd9e001077e42a7c085f1e871997647f Author: David Howells Date: Tue May 15 23:57:02 2007 -0700 AFS: write back dirty data on unmount Fix AFS to write back dirty on unmounting. This didn't happen because afs_super_ops.drop_inode was pointing to generic_delete_inode. Now this pointer is left set to NULL so that the default behaviour occurs instead. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52ade9b3b97fd3bea42842a056fe0786c28d0555 Author: Linus Torvalds Date: Wed May 16 15:28:14 2007 -0700 Fix ACPI suspend / device suspend ordering problem In commit e3c7db621bed4afb8e231cb005057f2feb5db557 we fixed the resume ordering, so that the ACPI low-level resume code was called before the actual driver resume was called. However, that broke the nesting logic of suspend and resume, and we continued to suspend the devices _after_ we the ACPI device suspend code was called. That resulted in us saving PCI state for devices that had already been changed by ACPI, and in some cases disabled entirely (causing the PCI save_state to be all-ones). Which in turn caused the wrong state to be written back on resume. This moves the ACPI device suspend to after the device model per-device suspend() calls. This fixes the bogus state save. Thanks to Lukáš Hejtmánek for testing. Acked-by: Lukas Hejtmanek Acked-by: Rafael J. Wysocki Cc: Len Brown Cc: Pavel Machek Cc: Andrew Morton Cc: Greg KH Signed-off-by: Linus Torvalds commit 576fe0bd7e52dce7afb6b9b2450744555b2eb53a Author: Christoph Hellwig Date: Wed May 16 14:52:19 2007 +0200 [IA64] optimize pagefaults a little Get rid of the notifier list and call the kprobes code directly if compiled in. This mirrors the changes that recently went into powerpc, s390 and sparc64. Signed-off-by: Christoph Hellwig Signed-off-by: Tony Luck commit a04395ead6d17c83da64264b6fe78f852a648202 Author: Thomas Reitmayr Date: Tue May 15 11:47:48 2007 +0200 [ALSA] usbaudio - Coping with short replies in usbmixer This patch makes sure that short USB replies are treated as an error when requesting the value of a certain mixer control. Signed-off-by: Thomas Reitmayr Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8286c53e54b8b1b9489b4dd5d2d3a4f94b8c012e Author: Daniel T Chen Date: Tue May 15 11:46:23 2007 +0200 [ALSA] Include quirks from Ubuntu Dapper/Edgy/Feisty Included is a patch against current alsa-kernel hg tip adding quirks that Ubuntu Dapper/Edgy/Feisty contains. Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 609d7694152f85734560ddc83be5e551b34d8c44 Author: Rene Herman Date: Tue May 15 11:42:56 2007 +0200 [ALSA] Fix probe of non-PnP ISA devices isa_register_driver() returns an error if no device is found and it's no fatal error for the drivers with pnp support. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 60af15f529d22a93805e74dd3c52b6f8134511d2 Author: Jaroslav Kysela Date: Wed May 16 11:45:47 2007 +0200 [ALSA] version 1.0.14rc4 Signed-off-by: Jaroslav Kysela commit 272a527c04c0c4f548232f1ec7d2d72bfdab4384 Author: Kailang Yang Date: Mon May 14 11:00:38 2007 +0200 [ALSA] hda-codec - Fix ALC882/861VD codec support on some laptops Fixed some platform no sound and Add JD Function for below platform list: Sony(0x104d) 0x9015, 0x900e, 0x1f00 Toshiba(0x1179) DALLAS 0xff00, 0xff01 Targa(0x1462) 0x28fb Asus(0x1043) A7J 0x060d Lenovo(0x17aa) 0x3bfd, 0x2085 MEDION(0x17c0) MD2 0x4071 Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a68660e0c63d8f7ab8725f9e771119c08e9f953b Author: Liam Girdwood Date: Thu May 10 19:27:27 2007 +0200 [ALSA] ASoC AC97 device reg bugfix This patch fixes a bug whereby AC97 bus device data was being clobbered when AC97 codecs using the generic ac97_codec.c driver were being registered. Codecs that didn't use the generic driver were unaffected (e.g. WM9712, WM9713). Changes:- o Add new AC97 codec class for custom (or need bus dev registration) AC97 codecs. o Only register/deregister this custom codec device with the AC97 bus. The generic AC97 driver already does this for generic codec devices. This may be related to bug #3038 :- https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3038 Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9ae67c7b870f5220a6b30e4f6e83b319bd9be718 Author: Liam Girdwood Date: Thu May 10 17:12:31 2007 +0200 [ALSA] ASoC AC97 static GPL symbol fix This patch fixes a bug whereby the GPL'ed symbol ac97_dai was being declared as static. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b75e53f09212f12369156710e84d1cbf115113cd Author: Takashi Iwai Date: Thu May 10 16:56:09 2007 +0200 [ALSA] hda-codec - Make the mixer capability check more robust In some cases, mixer elements return -EINVAL because it couldn't obtain proper amp_cap bits. The patch improves the robustness, trying the amp_cap query again in such a case. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d417045e7deeb37d97793805fe302da7b4f82eec Author: Daniel Drake Date: Thu May 10 08:52:19 2007 +0200 [ALSA] usb-audio: another Logitech QuickCam ID This patch adds the ID for another quickcam microphone, reported by freqmod on ALSA ticket #0003040 I'm going to submit a USB patch separately to provide a macro to simplify these entries, as suggested by Alan Stern. We could switch to using that in future. Signed-off-by: Daniel Drake Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 13b8d09f5de0aaa3153bbccc98baf247387823dc Author: Tejun Heo Date: Tue May 15 12:29:22 2007 +0200 libata: track spindown status and skip spindown_compat if possible Our assumption that most distros issue STANDBYNOW seems wrong. The upstream sysvinit and thus many distros including gentoo and opensuse don't take any action for libata disks on spindown. We can skip compat handling for these distros so that they don't need to update anything to take advantage of kernel-side shutdown. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit da071b42f73dabbd0daf7ea4c3ff157d53b00648 Author: Tejun Heo Date: Mon May 14 17:26:18 2007 +0200 libata: fix shutdown warning message printing Unlocking ap->lock and ssleeping don't work because SCSI commands can be issued from completion path without context. Reimplement delayed completion by allowing translation functions to override qc->scsidone(), storing the original completion function to scmd->scsi_done() and overriding qc->scsidone() with a function which schedules delayed invocation of scmd->scsi_done(). This isn't pretty at all but all the ugly parts are thankfully contained in the stop translation path where the compat feature is implemented. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3cadbcc09891b8544203f211dac13f9cc4e6832a Author: Tejun Heo Date: Tue May 15 03:28:15 2007 +0900 libata-acpi: add ATA_FLAG_ACPI_SATA port flag Whether a controller needs IDE or SATA ACPI hierarchy is determined by the programming interface of the controller not by whether the controller is SATA or PATA, or it supports slave device or not. This patch adds ATA_FLAG_ACPI_SATA port flags which tells libata-acpi that the port needs SATA ACPI nodes, and sets the flag for ahci and sata_sil24. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6ddcd3b0201a7ad72294347636d2b4028ddbd95d Author: Tejun Heo Date: Tue May 15 03:28:15 2007 +0900 libata: during revalidation, check n_sectors after device is configured Device might be resized during ata_dev_configure() due to HPA or (later) ACPI _GTF. Currently it's worked around by caching n_sectors before turning off HPA. The cached original size is overwritten if the device is reconfigured without being hardreset - which always happens after configuring trasnfer mode. If the device gets hardreset for some reason after that, revalidation fails with -ENODEV. This patch makes size checking more robust by moving n_sectors check from ata_dev_reread_id() to ata_dev_revalidate() after the device is fully configured. No matter what happens during configuration, a device must have the same n_sectors after fully configured to be treated as the same device. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit fe30911b34098db58c21d0f936f6c3f17f32deb8 Author: Tejun Heo Date: Tue May 15 03:28:15 2007 +0900 libata: separate out ata_dev_reread_id() Separate out ata_dev_reread_id() from ata_dev_revalidate(). ata_dev_reread_id() reads IDENTIFY page and determines whether the same device is still there. ata_dev_revalidate() reconfigures after reread completes. This will be used by ACPI update. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d1c68fa6ce7e56e300d8561bb3b6492c336df863 Author: Al Viro Date: Tue May 15 08:21:17 2007 +0100 pata_scc had been missed by ata_std_prereset() switch Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit c7754d465b1feade85b5f1c4492781a30f6652a2 Author: David S. Miller Date: Tue May 15 17:03:54 2007 -0700 [SPARC64]: Add hypervisor API negotiation and fix console bugs. Hypervisor interfaces need to be negotiated in order to use some API calls reliably. So add a small set of interfaces to request API versions and query current settings. This allows us to fix some bugs in the hypervisor console: 1) If we can negotiate API group CORE of at least major 1 minor 1 we can use con_read and con_write which can improve console performance quite a bit. 2) When we do a console write request, we should hold the spinlock around the whole request, not a byte at a time. What would happen is that it's easy for output from different cpus to get mixed with each other. 3) Use consistent udelay() based polling, udelay(1) each loop with a limit of 1000 polls to handle stuck hypervisor console. Signed-off-by: David S. Miller commit 7b104bcb8e460e45a1aebe3da9b86aacdb4cab12 Author: Al Viro Date: Tue May 15 20:37:20 2007 +0100 arm: walk_stacktrace() needs to be exported oprofile depends on having it Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ecec5ba681a0bf1165899f8b1889f06fcd8e901a Author: Al Viro Date: Tue May 15 20:36:00 2007 +0100 fix uml-x86_64 __NR_syscall_max is done in x86_64 asm-offsets; do an equivalent in uml kern_constants.h Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 327b9eebbf2b7ce632e93a9c1386d944af0dadf4 Author: Al Viro Date: Tue May 15 20:37:10 2007 +0100 audit_match_signal() and friends are used only if CONFIG_AUDITSYSCALL is set Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b4e1ded3cf6e13c122f019532cb60347d6c88c8c Author: Al Viro Date: Tue May 15 20:37:00 2007 +0100 m32r: __xchg() should be always_inline it depends on elimination of unreachable branches in switch (by object size), so we must declare it always_inline Signed-off-by: Al Viro Acked-by: Hirokazu Takata Signed-off-by: Linus Torvalds commit 8eafafb54bc594be8a23b00b25055b59838a9c79 Author: Al Viro Date: Tue May 15 20:36:50 2007 +0100 rpadlpar breakage - fallout of struct subsystem removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1b2bad2f049e405530b4a8a478edc45770b219c1 Author: Al Viro Date: Tue May 15 20:36:40 2007 +0100 em28xx and ivtv should depend on PCI .. because video-buf.c requires PCI, and VIDEO_EM28XX selects it. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9cbe05c71251b51607d80256c3b3754957bb5ed8 Author: Al Viro Date: Tue May 15 20:36:30 2007 +0100 missing includes in mlx4 Signed-off-by: Al Viro Acked-by: Jeff Garzik Acked-by: Roland Dreier Signed-off-by: Linus Torvalds commit 7a86edef395576f69d2513c62aea7c966043bc8d Author: Al Viro Date: Tue May 15 20:36:20 2007 +0100 missing dependencies for USB drivers in input stuff that does select USB should depend on USB_ARCH_HAS_HCD, or we'll end up with unbuildable configs. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit faa2fb4e67775101a5c46074fa24f0d81cdb4deb Author: Al Viro Date: Tue May 15 20:36:10 2007 +0100 missing mm.h in fw-ohci need it for page_private(), not all targets have it pulled indirectly Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 28aa483f80d146a8f117eb65a4fddf31d58230d7 Author: Linus Torvalds Date: Tue May 15 18:45:49 2007 -0700 x86: Fix discontigmem + non-HIGHMEM compile It's not necessarily a very sane configuration, but people running "make randconfig" noticed it wouldn't compile. This fixes some obvious problems in discontig.c to allow a clean compile. Acked-by: andrew hendry Signed-off-by: Linus Torvalds commit e0ff9cd12a26259f8dd676124a188037e7e90b38 Author: Jan Engelhardt Date: Wed May 16 00:51:46 2007 +0200 Use menuconfig objects: IDE Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 640b31bf1291d1fb8a3e90abed8f145410122bf8 Author: Alan Cox Date: Wed May 16 00:51:46 2007 +0200 sl82c105: Switch to ref counting API Not sure how this one got missed in the great purge some time ago but it did. Signed-off-by: Alan Cox Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 122ab0887c36247bd4508c25e4fccf9264546fe2 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:46 2007 +0200 ide: remove ide_use_dma() ide_use_dma() duplicates a lot of ide_max_dma_mode() functionality and as all users of ide_use_dma() were converted to use ide_tune_dma() now it is possible to add missing checks to ide_tune_dma() and remove ide_use_dma() completely, so do it. There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 3649c06e66ad3589374e8765ed69eda65658735c Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:46 2007 +0200 ide: add missing validity checks for identify words 62 and 63 Check validity of identify words 62 and 63 before using them in ide_get_mode_mask(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 4728d546d7137ad5350cc2e53d4748fd26f61a60 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:46 2007 +0200 ide: remove ide_dma_enable() * check ->speedproc return value in ide_tune_dma() * use ide_tune_dma() in cmd64x/cs5530/sc1200/siimage/sl82c105/scc_pata drivers * remove no longer needed ide_dma_enable() Signed-off-by: Bartlomiej Zolnierkiewicz commit 46cedc9b773795b6190c31e5d32de5207b55a356 Author: Sergei Shtylyov Date: Wed May 16 00:51:44 2007 +0200 sl82c105: add speedproc() method and MWDMA0/1 support Add the speedproc() method for setting transfer modes, modify config_for_dma() to call it and use ide_max_dma_mode() to select the best DMA mode. Add support for the multiword DMA modes 0 and 1, using the upper half of the 'drive_data' field to store the DMA timings to program into the drive control register when DMA is turned on for real. Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 3c3f5d2c9f64b47aceb88f8d80fcb70fb9f9809f Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:44 2007 +0200 cs5530/sc1200: add ->speedproc support * add {cs5530,sc1200}_tunepio() for programming PIO timings * add {cs5530,sc1200}_tune_chipset() (->speedproc method) for setting transfer mode and convert {cs5530,sc1200}_config_dma() to use it * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit a01ba4011aa745be44d0290c5da5cb2dfb4e37ce Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:44 2007 +0200 cs5530/sc1200: DMA support cleanup sc1200.c: * remove open-coded variant of ide_dma_host_off() (== ->dma_host_off), it is not needed because ->dma_off_quietly calls ->dma_host_off * use ->dma_host_on (== ide_dma_host_on() for this driver) instead of open-coded variant, call it from the users of sc1200_config_dma2() [ there is no need to call ->dma_host_on in sc1200_config_dma() because core code takes care of calling ->ide_dma_on on successful execution of ->ide_dma_check ] * add comment about ->tuneproc interface abuse cs5530.c/sc1200.c: * core code takes care of calling ->dma_off_quietly before calling ->ide_dma_check so there is no need to call it in ->ide_dma_check methods * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit bd203b57c7edd6bc457b769cd15fa7239cd2241e Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 ide: use ide_tune_dma() part #2 Use ide_tune_dma() in ide-cris/it821x/pdc202xx_old/serverworks drivers. Signed-off-by: Bartlomiej Zolnierkiewicz commit 5fd216bbb277b645109a889c489e13a7aafbc304 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 cs5530/sc1200: add ->udma_filter methods CS5530/SC1200 specifies that two drives on the same cable cannot mix UDMA/MDMA. Add {cs5530,sc1200}_udma_filter() to handle this. This also makes it possible to remove open-coded best DMA mode selection and use standard ide_use_dma()/ide_max_dma_mode() helpers. While at it bump version numbers. There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 793a97228d3da876f42b7fb4d4a52cc8cc86dc81 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 ide: always disable DMA before tuning it ide_start_power_step() and set_using_dma() were missing ->dma_off_quietly call (comment in probe_hwif() states that DMA should be always cleared before tuning is attempted). Fix it. Signed-off-by: Bartlomiej Zolnierkiewicz commit 7f86723a60d287be19aee620277184f9f5455283 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 pdc202xx_new: use ide_tune_dma() * remove code enabling IORDY and prefetch from config_chipset_for_dma(), as the comment states it has no real effect because these settings are overriden when the PIO mode is set (and for this driver ->autotune == 1 so PIO mode is always programmed) * use ide_tune_dma() in pdcnew_config_drive_xfer_rate() and remove no longer needed config_chipset_for_dma() There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 38ff8a74e8f015f94289b84cd6572a68c3431cdd Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 alim15x3: use ide_tune_dma() Use ide_tune_dma() in ali15x3_config_drive_for_dma() and remove all the open coded DMA tuning code and also config_chipset_for_dma(). Set ->atapi_dma flag correctly in init_hwif_common_ali15x3() so ide_tune_dma() can take care of checking if ATAPI DMA is allowed and remove open coded ATAPI DMA check from ali15x3_config_drive_for_dma(). There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 6b8cf7724bd0f8ae1f61937c5f40f4dbbda40960 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:42 2007 +0200 sis5513: PIO mode setup fixes * limit max PIO mode to PIO4, this driver doesn't support PIO5 and attempt to program PIO5 by config_art_rwp_pio() could result in incorrect PIO timings being programmed and possibly the data corruption (for < ATA100 family chipsets PIO0 timings were used, for ATA100 and ATA100a - the random content of test1 variable was used, for ATA133 - MWDMA0 timings were used) * BUG() in sis5513_tune_chipset() if somebody tries to force unsupported PIO5, also cleanup this function a bit while at it * add comment about PIO0 timings for < ATA100 family chipsets * remove open-coded best PIO mode selection from config_art_rwp_pio(), it contained numerous bugs: - it didn't check for validity of id->eide_pio_modes and id->eide_pio_iordy before using them - it tried to found out maximum PIO mode basing on minimum IORDY cycle time (moreover wrong cycle times were used for PIO1/5) - it was overriding PIO blacklist and conservative PIO "downgrade" done by ide_get_best_pio_mode() * use sis5513_tune_drive() instead of config_art_rwp_pio() in sis5513_config_xfer_rate() so the correct PIO mode is also set on drive even if the device is not IORDY/DMA capable * config_art_rwp_pio() was always setting the best possible mode and not the wanted one - fix it and move ide_get_best_pio_mode() call to config_chipset_for_pio() * don't use ide_find_best_mode() in config_chipset_for_pio(), it was being overriden by config_art_rwp_pio() for the host timings anyway + we need to set the same PIO mode on the device and the host * pass correct "pio" argument (255 instead of 5) to sis5513_tune_drive() call in sis5513_config_xfer_rate() so the best PIO mode is set on the drive and not PIO4 * rename sis5513_tune_drive() to sis5513_tuneproc() and config_chipset_for_pio() to sis5513_tune_driver() * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit 9445de76c124e90176b5116cf82f6cd1413f5230 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:42 2007 +0200 serverworks: PIO mode setup fixes * limit max PIO mode to PIO4, this driver doesn't support PIO5 and attempt to program PIO5 by svwks_tune_chipset() could result in incorrect PIO timings being programmed and possibly the data corruption (it seems that the minimum possible values were used but I lack the datasheets to be sure) * select best PIO mode in svwks_tune_drive() and not in svwks_tune_chipset() when doing PIO autotuning (pio == 255) * don't try to tune PIO in config_chipset_for_dma() as ide_dma_enable() could return 1 if DMA was previously enabled (svwks_config_drive_xfer_rate() takes care of PIO tuning if no suitable DMA mode is found) * remove config_chipset_for_pio() and use svwks_tune_drive() instead, config_chipset_for_pio() contained numerous bugs when selecting PIO mode (luckily it was only used for devices limited to PIO by capabilities/BIOS): - it didn't check for validity of id->eide_pio_modes and id->eide_pio_iordy before using them - it tried to found out maximum PIO mode basing on minimum IORDY cycle time (moreover wrong cycle times were used for PIO0/1/5) - it was overriding PIO blacklist and conservative PIO "downgrade" done by ide_get_best_pio_mode() - if the max drive PIO was PIO5 then XFER_PIO_0/XFER_PIO_SLOW was selected (XFER_PIO_SLOW is not supported by svwks_tune_chipset() so the result was the same as if using XFER_PIO_5 => wrong PIO timings were set) - it was overriding drive->current_speed * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit 4fce3164b84d5b014acbf5a3f57eb3650e154f5b Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:41 2007 +0200 pdc202xx_old: rewrite mode programming code (v2) This patch is based on the documentation (I would like to thank Promise for it) and also partially on the older vendor driver. Rewrite mode programming code: * disable 66MHz clock in pdc202xx_tune_chipset() so it is correctly disabled even if both devices on the channel are not DMA capable and after reset * enable/disable IORDY and PREFETCH bits in pdc202xx_tune_chipset() as they need to be setup correctly also for PIO only devices, plus IORDY wasn't disabled for non-IORDY devices and PREFETCH wasn't disabled for ATAPI devices * remove dead code for setting SYNC_ERDDY_EN bits from config_chipset_for_dma() (driver sets ->autotune to 1 so PIO modes are always programmed => lower nibble of register A never equals 4 => "chipset_is_set" is always true) * enable PIO mode programming for all ATAPI devices (it was limited to ->media == ide_cdrom devices) * remove extra reads of registers A/B/C, don't read register D et all * do clearing / programming of registers A/B/C in one go (gets rid of extra PCI config space read/write cycle) * set initial values of drive_conf/AP/BP/CP variables to zero (paranoia for the case when PCI reads fail) * remove XFER_UDMA6 to XFER_UDMA5 remapping case - it can't happen (ide_rate_filter() takes care of it) * fix XFER_MW_DMA0 timings (they were overclocked, use the official ones) * fix bitmasks for clearing bits of register B: - when programming DMA mode bit 0x10 of register B was cleared which resulted in overclocked PIO timing setting (iff PIO0 was used) - when programming PIO mode bits 0x18 weren't cleared so suboptimal timings were used for PIO1-4 if PIO0 was previously set (bit 0x10) and for PIO0/3/4 if PIO1/2 was previously set (bit 0x08) * add FIXME comment about missing locking for 66MHz clock register Also while at it: * remove unused defines * do a few cosmetic / CodingStyle fixes * bump driver version v2: * in pdc202xx_tune_chipset() the old content of drive configuration registers is used only by the debugging code so cover "drive_conf" PCI registers read by #if PDC202XX_DEBUG_DRIVE_INFO (Noticed by Sergei Shtylyov) Signed-off-by: Bartlomiej Zolnierkiewicz commit 4e19b5c193454ade8d86468077078f680d121979 Author: Kim Phillips Date: Fri May 11 18:25:07 2007 -0500 ucc_geth: eliminate max-speed, change interface-type to phy-connection-type It was agreed that phy-connection-type was a better name for the interface-type property, so this patch renames it. Also, the max-speed property name was determined too generic, and is therefore eliminated in favour of phy-connection-type derivation logic. includes corrections to copyright text. Signed-off-by: Kim Phillips Signed-off-by: Jeff Garzik commit f2773a29596d835d2b00137ba925c186699ea117 Author: Vitaly Wool Date: Sun May 13 18:42:08 2007 +0400 smc911x: fix compilation breakage Looks like the new version of this patch has been overlooked, so I'm resending it. It just adapts the driver to the new IRQ API according to what Russell has pointed out. drivers/net/smc911x.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) Signed-off-by: Vitaly Wool Signed-off-by: Jeff Garzik commit 1af7f05628fab81fdf4412d757676412ba5db660 Author: olof@lixom.net Date: Sat May 12 14:57:46 2007 -0500 pasemi_mac: Fix local-mac-address parsing Turns out we have an old version of firmware that stores the mac address in 'mac-address' as a string instead of a byte array. All versions that use local-mac-address should have it as byte array, so no need to do string parsing for that case. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit fd17825480b2de3076727c677f8e257623705963 Author: olof@lixom.net Date: Sat May 12 14:57:36 2007 -0500 pasemi_mac: Terminate PCI ID list This caused some very interesting behaviour depending on what happened to be built at the same time. Add terminating empty entry to the list of IDs. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit 52a9435183f961e1bb3c146a62bfbecf93d15d58 Author: Olof Johansson Date: Sat May 12 18:01:09 2007 -0500 pasemi_mac: Interrupt ack fixes Interrupt ack fixes Fix the packet count resets at interrupt time, using the cacheable packet count status to set number of processed/received packets, since the ack count is the cumulative number of packets processed, and not incremental. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit a54c545134ea77609ed9eb5df50524c097112327 Author: olof@lixom.net Date: Sat May 12 14:57:27 2007 -0500 pasemi_mac: Fix register defines Some shift values were obviously wrong. Fix them to correspond with the masks. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit 17028c5c91580036eb41da2fad292965fa3b9a7d Author: Martin Michlmayr Date: Tue May 15 21:03:36 2007 +0200 [IA64] Fix section conflict of ia64_mlogbuf_finish Building with GCC 4.2, I get the following error: CC arch/ia64/kernel/mca.o arch/ia64/kernel/mca.c:275: error: __ksymtab_ia64_mlogbuf_finish causes a section type conflict This is because ia64_mlogbuf_finish is both declared static and exported. Fix by removing the export (which is unneeded now). Signed-off-by: Martin Michlmayr Signed-off-by: Tony Luck commit f653c34dd3d8bde2c918316fd5ba2e2c4f95afcf Author: Jens Axboe Date: Tue May 15 19:30:07 2007 +0200 ll_rw_blk: fix gcc 4.2 warning on current_io_context() current_io_context() is both static and exported with EXPORT_SYMBOL(). As there are no users outside of ll_rw_blk.c itself, just kill the export. Problem reported by Martin Michlmayr Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit cfbf07f2a80b618c42a42c20d83647ea8fcceca0 Author: Christoph Lameter Date: Tue May 15 01:42:06 2007 -0700 SLUB: CONFIG_LARGE_ALLOCS must consider MAX_ORDER limit Take MAX_ORDER into consideration when determining KMALLOC_SHIFT_HIGH. Otherwise we may run into a situation where we attempt to create general slabs larger than MAX_ORDER. Signed-off-by: Christoph Lameter Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a3ee3d5529c5e66aedf91401bfac65c61998639 Author: Jeremy Fitzhardinge Date: Tue May 15 01:41:59 2007 -0700 i386: fix voyager build This adds an smp_ops for voyager, and hooks things up appropriately. This is the first baby-step to making subarch runtime switchable. Signed-off-by: Jeremy Fitzhardinge Cc: James Bottomley Cc: Eric W. Biederman Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 297d9c035edd04327fedc0d1da27c2b112b66fcc Author: Jeremy Fitzhardinge Date: Tue May 15 01:41:48 2007 -0700 i386: move common parts of smp into their own file Several parts of kernel/smp.c and smpboot.c are generally useful for other subarchitectures and paravirt_ops implementations, so make them available for reuse. Signed-off-by: Jeremy Fitzhardinge Acked-by: Chris Wright Cc: James Bottomley Cc: Eric W. Biederman Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 838c41184fee5e151c09972f2ba90c16493af614 Author: Prarit Bhargava Date: Tue May 15 01:41:43 2007 -0700 Remove cpu hotplug defines for __INIT & __INITDATA After examining what was checked in and the code base I discovered that most of 86c0baf123e474b6eb404798926ecf62b426bf3a wasn't necessary anymore.... So here's a patch that reverts the last part of that changeset: Revert part of 86c0baf123e474b6eb404798926ecf62b426bf3a. The kernel has moved forward to a state where the original change is not necessary. After porting forward, this final version of the patch was applied and broke non-x86 architectures. Signed-off-by: Prarit Bhargava Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bd2aad2103314a0a09614dc29926a1437db02f7 Author: Stephen Rothwell Date: Tue May 15 01:41:36 2007 -0700 Revert "MAINTAINERS: remove invalid list address for TPM" This reverts commit b6d1c9a44744224d83125a5a89c1a6cc4db27361. Others tell me that this address has worked for them, so I can only assume that I hit a glitch in the sourceforge mail system. Signed-off-by: Stephen Rothwell Cc: Kylene Hall Cc: Marcel Selhorst Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f89441b37536fea92b1ed7004e5e2dda011473d Author: Thomas Gleixner Date: Tue May 15 01:41:32 2007 -0700 clocksource: fix lock order in the resume path lockdep complains about the lock nesting of clocksource and watchdog lock in the resume path. Change the resume marker to a bit operation and remove the lock from this path. Signed-off-by: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c46bdcaec53eda069a8a9cd60621c7431aa7842 Author: Geert Uytterhoeven Date: Tue May 15 01:41:29 2007 -0700 m68k: implement __clear_user() m68k: implement __clear_user(), which is needed by fs/signalfd.c Since we always let the MMU do all checking, clear_user() and __clear_user() are identical. The old clear_user() is renamed to __clear_user() for consistency. Signed-off-by: Geert Uytterhoeven Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fcdf96ca95f81a0e1fd91a2de16dc67c641c958 Author: Simon Horman Date: Tue May 15 01:41:15 2007 -0700 alpha: fix hard_smp_processor_id compile error "Remove hardcoding of hard_smp_processor_id on UP systems", 2f4dfe206a2fc07099dfad77a8ea2f4b4ae2140f in Linus' tree, moved the definition of hard_smp_processor_id linux/smp.h to asm/smp.h for UP systems. This causes a regression on Alpha. cc1: warnings being treated as errors arch/alpha/kernel/setup.c: In function 'setup_arch': arch/alpha/kernel/setup.c:506: warning: implicit declaration of function 'hard_smp_processor_id' make[1]: *** [arch/alpha/kernel/setup.o] error 1 make: *** [arch/alpha/kernel] error 2 By including asm/smp.h non-conditionally in asm/mmu_context.h the problem appears to be resolved. Cc: Fernando Luis Vazquez Cao Signed-off-by: Simon Horman Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b67405bbbba6bbd28dfd5337b29d5bc5a1140afb Author: Yoshinori Sato Date: Tue May 15 01:41:07 2007 -0700 h8300 atomic.h update add atomic_sub_and_test define. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 218f0aaee8a6b0e5772b95b154dea5b7701b33aa Author: Paul Mundt Date: Tue May 15 01:41:02 2007 -0700 nommu: add ioremap_page_range() lib/ioremap.c is presently only built in if CONFIG_MMU is set. While this is reasonable, platforms that support both CONFIG_MMU=y or n need to be able to call in to this regardless. As none of the current nommu platforms do anything special with ioremap(), we assume that it's always successful. This fixes the SH-4 build with CONFIG_MMU=n. Signed-off-by: Paul Mundt Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0ee9aabb0520adea5937855a9575c08a97b16e7 Author: Davide Libenzi Date: Tue May 15 01:40:57 2007 -0700 epoll: move kfree inside ep_free Move the kfree() call inside the ep_free() function. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67647d0fb8bc03609d045a9cce85f7ef6d763036 Author: Davide Libenzi Date: Tue May 15 01:40:52 2007 -0700 epoll: fix some comments Fixes some epoll code comments. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7ea76302547f81e4583d0d7c52a1c37c6747f5d Author: Davide Libenzi Date: Tue May 15 01:40:47 2007 -0700 epoll locks changes and cleanups Changes the rwlock to a spinlock, and drops the use-count variable. Operations are always bound by the mutex now, so the use-count is no more needed. For the same reason, the rwlock can become a simple spinlock. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d47de16c7221968d3eab899d7540efa5ba77af5a Author: Davide Libenzi Date: Tue May 15 01:40:41 2007 -0700 fix epoll single pass code and add wait-exclusive flag Fixes the epoll single pass code. During the unlocked event delivery (to userspace) code, the poll callback can re-issue new events, and we must receive them correctly. Since we loop in a lockless fashion, we want to be O(nready), and we don't want to flash on/off the spinlock for every event, we have the poll callback to use a secondary list to queue events while we're inside the event delivery loop. The rw_semaphore has been turned into a mutex. This patch also adds the wait-exclusive flag, as suggested by Davi Arnaut. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0a2b7af27f6d01a443f3af8252fa0b955bf1913 Author: Haavard Skinnemoen Date: Wed Mar 21 18:08:49 2007 +0100 [AVR32] Implement platform hooks for atmel_lcdfb driver This modifies and extends the existing lcdc platform code to support the new atmel_lcdfb driver. The ATSTK1000 board code is set up to use the on-board Samsung LTV350QV LCD panel. Signed-off-by: Haavard Skinnemoen commit 7531d692d4174789d583eb50fcb83cefa121b790 Author: Trond Myklebust Date: Mon May 14 17:21:26 2007 -0400 SUNRPC: Fix sparse warnings - net/sunrpc/xprtsock.c:1635:5: warning: symbol 'init_socket_xprt' was not declared. Should it be static? - net/sunrpc/xprtsock.c:1649:6: warning: symbol 'cleanup_socket_xprt' was not declared. Should it be static? Signed-off-by: Trond Myklebust commit d48c5f41000ad176df71d2d43932c6c50f938196 Author: Trond Myklebust Date: Mon May 14 17:21:26 2007 -0400 NLM: Fix sparse warnings - fs/lockd/xdr4.c:140:27: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:141:27: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:432:28: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:433:28: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:587:20: warning: symbol 'nlm_version4' was not declared. Should it be static? Signed-off-by: Trond Myklebust commit 2e42c3e2aec6e24e58c4c601e1a33f0e9e36e314 Author: Trond Myklebust Date: Mon May 14 17:20:41 2007 -0400 NFS: Fix more sparse warnings - fs/nfs/nfs4xdr.c:2499:42: warning: incorrect type in argument 2 (different signedness) - fs/nfs/nfs4xdr.c:2658:49: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/nfs4xdr.c:2683:50: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/nfs4xdr.c:3063:68: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/nfs4xdr.c:3065:68: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/callback_xdr.c:138:31: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Trond Myklebust commit 10afec9081fee7e48995fa396fba22c7de4b99d4 Author: Trond Myklebust Date: Mon May 14 17:16:04 2007 -0400 NFS: Fix some 'sparse' warnings... - fs/nfs/dir.c:610:8: warning: symbol 'nfs_llseek_dir' was not declared. Should it be static? - fs/nfs/dir.c:636:5: warning: symbol 'nfs_fsync_dir' was not declared. Should it be static? - fs/nfs/write.c:925:19: warning: symbol 'req' shadows an earlier one - fs/nfs/write.c:61:6: warning: symbol 'nfs_commit_rcu_free' was not declared. Should it be static? - fs/nfs/nfs4proc.c:793:5: warning: symbol 'nfs4_recover_expired_lease' was not declared. Should it be static? Signed-off-by: Trond Myklebust commit 9c9cc93ad2a5d9972672e03685af20e8cea1e5a4 Author: Christoph Hellwig Date: Fri Feb 9 20:06:49 2007 +0000 SUNRPC: remove dead variable 'rpciod_running' rpciod_running is not used at all, but due to the way DECLARE_MUTEX_LOCKED works we don't get a warning for it. Signed-off-by: Christoph Hellwig Signed-off-by: Trond Myklebust commit 8ae20abdd18c6c7f21bbae931353e7cfad77d7b6 Author: Trond Myklebust Date: Mon May 14 16:50:45 2007 -0400 NFS4: Fix incorrect use of sizeof() in fs/nfs/nfs4xdr.c The XDR code should not depend on the physical allocation size of structures like nfs4_stateid and nfs4_verifier since those may have to change at some future date. We therefore replace all uses of sizeof() with constants like NFS4_VERIFIER_SIZE and NFS4_STATEID_SIZE. This also has the side-effect of fixing some warnings of the type format ‘%u’ expects type ‘unsigned int’, but argument X has type ‘long unsigned int’ on 64-bit systems Signed-off-by: Trond Myklebust commit 60945cb7c8377b727288275f21791914fe65311c Author: Nate Diller Date: Thu May 10 22:55:08 2007 -0700 NFS: use zero_user_page Use zero_user_page() instead of the newly deprecated memclear_highpage_flush(). Signed-off-by: Nate Diller Cc: Trond Myklebust Cc: "J. Bruce Fields" Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit 550facd138d8f6b0ca683c1e894b5cd0f381cb63 Author: Oleg Nesterov Date: Thu May 10 22:55:07 2007 -0700 NLM: don't use CLONE_SIGHAND in nlmclnt_recovery reclaimer() calls allow_signal() which plays with parent process's ->sighand. Signed-off-by: Oleg Nesterov Cc: Trond Myklebust Cc: "J. Bruce Fields" Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit 21051ba6259c519e20a7d575ddceb16e84ad2a5d Author: Trond Myklebust Date: Mon May 14 16:50:44 2007 -0400 NLM: Fix locking client timeouts... nlmsvc_timeout is already in units of HZ... Signed-off-by: Trond Myklebust commit c47953cfc6bad91c46272aad202ee33276671608 Author: Tony Luck Date: Fri May 11 15:18:45 2007 -0700 [IA64] s/scalibility/scalability/ Previous spelling patch from Simon Arlott broke one spot that didn't need fixing (reported by Simon within 35 minutes of the patch ... but not until after I'd applied to GIT and pushed :-( Signed-off-by: Tony Luck commit 311f594dec9b0c8693ec7df75b82c251b6b0e7c2 Author: Jay Lan Date: Tue Apr 3 17:53:42 2007 -0700 [IA64] kdump on INIT needs multi-nodes sync-up (v.2) The current implementation of kdump on INIT events would enter kdump processing on DIE_INIT_MONARCH_ENTER and DIE_INIT_SLAVE_ENTER events. Thus, the monarch cpu would go ahead and boot up the kdump On SN shub2 systems, this out-of-sync situation causes some slave cpus on different nodes to enter POD. This patch moves kdump entry points to DIE_INIT_MONARCH_LEAVE and DIE_INIT_SLAVE_LEAVE. It also sets kdump_in_progress variable in the DIE_INIT_MONARCH_PROCESS event to not dump all active stack traces to the console in the case of kdump. I have tested this patch on an SN machine and a HP RX2600. Signed-off-by: Jay Lan Acked-by: Zou Nan hai Signed-off-by: Tony Luck commit ae67e498a54259364f7211e10d9834575b340b21 Author: Tony Luck Date: Mon May 14 15:55:11 2007 -0700 [IA64] wire up {signal,timer,event}fd syscalls Signed-off-by: Tony Luck commit 99fbe1ac217e8b9d4141504e879327cb4e42d4ff Author: Dave Jones Date: Mon May 14 18:27:29 2007 -0400 [CPUFREQ] Correct revision mask for powernow-k8 Mark Langsdorf points out that the correct define for this revision bump is 0x80000. Also to save us having to keep renaming the #define, give it a more meaningful name. Signed-off-by: Dave Jones commit faa8b6c3c2e1454175609167a25ae525d075f045 Author: Linus Torvalds Date: Mon May 14 15:24:24 2007 -0700 Revert "ipmi: add new IPMI nmi watchdog handling" This reverts commit f64da958dfc83335de1d2bef9d3868f30feb4e53. Andi Kleen is unhappy with the changes, and they really do not seem worth it. IPMI could use DIE_NMI_IPI instead of the new callback, even though that ends up having its own set of problems too, mainly because the IPMI code cannot really know the NMI was from IPMI or not. Manually fix up conflicts in arch/x86_64/kernel/traps.c and drivers/char/ipmi/ipmi_watchdog.c. Cc: Andi Kleen Cc: Mathieu Desnoyers Cc: Corey Minyard Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 7c5b9ef8577bfa7b74ea58fc9ff2934ffce13532 Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IPoIB/cm: Optimize stale connection detection In the presence of some running RX connections, we repeat queue_delayed_work calls each 4 RX WRs, which is a waste. It's enough to start stale task when a first passive connection is added, and rerun it every IPOIB_CM_RX_DELAY as long as there are outstanding passive connections. This removes some code from RX data path. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit bd18c112774db5bb887adb981ffbe9bfe00b2f3a Author: Michael S. Tsirkin Date: Mon May 14 17:14:50 2007 +0300 IB/mthca: Set cleaned CQEs back to HW ownership when cleaning CQ mthca_cq_clean() updates the CQ consumer index without moving CQEs back to HW ownership. As a result, the same WRID might get reported twice, resulting in a use-after-free. This was observed in IPoIB CM. Fix by moving all freed CQEs to HW ownership. This fixes Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 3e28c56b9b67347b42ba06f9a9373b408902beee Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IB/mthca: Fix posting >255 recv WRs for Tavor Fix posting lists of > 255 receive WRs for Tavor: rq.next_ind must be updated each doorbell, otherwise the next doorbell will use an incorrect index. Found by Ronni Zimmermann at Mellanox. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 6c719f5c6c823901fac2d46b83db5a69ba7e9152 Author: Sean Hefty Date: Mon May 7 11:49:27 2007 -0700 RDMA/cma: Add check to validate that cm_id is bound to a device Several checks in the rdma_cm check against the state of the cm_id, but only to validate that the cm_id is bound to an underlying transport specific CM and an RDMA device. Make the check explicit in what we're trying to check for, since we're not synchronizing against the cm_id state. This will allow a user to disconnect a cm_id or reject a connection after receiving a device removal event. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit be65f086f2a50c478b2f5ecf4c55a52a4e95059a Author: Sean Hefty Date: Mon May 7 11:49:12 2007 -0700 RDMA/cma: Fix synchronization with device removal in cma_iw_handler The cma_iw_handler needs to validate the state of the rdma_cm_id before processing a new connection request to ensure that a device removal is not already being processed for the same rdma_cm_id. Without the state check, the user can receive simultaneous callbacks for the same cm_id, or a callback after they've destroyed the cm_id. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 8aa08602bdd617a9cdd147f19076a8c8a70e03ef Author: Sean Hefty Date: Mon May 7 11:49:00 2007 -0700 RDMA/cma: Simplify device removal handling code Add a new routine and rename another to encapsulate common code for synchronizing with device removal. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4e430dcb7b132a4076e533a9d69907acecbe71be Author: Joachim Fenkes Date: Wed May 9 13:48:31 2007 +0200 IB/ehca: Disable scaling code by default, bump version number - Scaling code is still considered experimental, so disable it by default - Increase version to SVNEHCA_0023 Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit bba9b6013e604fadb298191c058149acf1cdfced Author: Joachim Fenkes Date: Wed May 9 13:48:25 2007 +0200 IB/ehca: Beautify sysfs attribute code and fix compiler warnings eHCA's sysfs attributes are now being created via sysfs_create_group(), making the process neatly table-driven. The return value is checked, thus fixing a few compiler warnings. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit c7a14939e78e75dd90b54cb0df371019bc6d3e89 Author: Joachim Fenkes Date: Wed May 9 13:48:20 2007 +0200 IB/ehca: Remove _irqsave, move #ifdef - In ehca_process_eq(), we're IRQ safe throughout the whole function, so we don't need another _irqsave in the middle of flight. - take_over_work() is only called by comp_pool_callback(), so it can move into the same #ifdef block. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit c55a0ddd8ebdd657224449c2fbfcd427e054c8cc Author: Hoang-Nam Nguyen Date: Wed May 9 13:48:11 2007 +0200 IB/ehca: Fix AQP0/1 QP number AQP0/1 should report qp_num={0|1} and the actual QP# should be stored in struct ehca_qp, not the other way round. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 92761cdaf215599a1bd81d383facb32adabfa620 Author: Joachim Fenkes Date: Wed May 9 13:48:01 2007 +0200 IB/ehca: Correctly set GRH mask bit in ehca_modify_qp() The driver needs to always supply the "GRH present" flag to the hypervisor, whether it's true or false. Not supplying it (i.e. not setting the corresponding mask bit) amounts to a "perhaps", which we don't want. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 5d88278e3bdb6f2e4ed43306659e930ecd715f0c Author: Stefan Roscher Date: Wed May 9 13:47:56 2007 +0200 IB/ehca: Serialize hypervisor calls in ehca_register_mr() Some pSeries hypervisor versions show a race condition in the allocate MR hCall. Serialize this call per adapter to circumvent this problem. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 8f140b407f3be04e7202be9aa0cfef3006d14c9f Author: Arthur Jones Date: Thu May 10 12:10:49 2007 -0700 IB/ipath: Shadow the gpio_mask register Once upon a time, GPIO interrupts were rare. But then a chip bug in the waldo series forced the use of a GPIO interrupt to signal packet reception. This greatly increased the frequency of GPIO interrupts which have the gpio_mask bits set on the waldo chips. Other bits in the gpio_status register are used for I2C clock and data lines, these bits are usually on. An "unlikely" annotation leftover from the old days was improperly applied to these bits, and an unnecessary chip mmio read was being accessed in the interrupt fast path on waldo. Remove the stagnant unlikely annotation in the interrupt handler and keep a shadow copy of the gpio_mask register to avoid the slow mmio read when testing for interruptable GPIO bits. Signed-off-by: Arthur Jones Signed-off-by: Roland Dreier commit 26c6bc7b812b4157ba929035e467c0f4dd165916 Author: Jack Morgenstein Date: Sun May 13 17:18:23 2007 +0300 IB/mlx4: Fix uninitialized spinlock for 32-bit archs uar_lock spinlock was used in mlx4_ib_cq_arm without being initialized (this only affects 32-bit archs, because uar_lock is not used on 64-bit archs and MLX4_INIT_DOORBELL_LOCK() is a NOP). Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 140ff8b0459cac5ade7a42131f561a9ee0fa3cc4 Author: Stephen Rothwell Date: Mon May 14 13:47:47 2007 +1000 Declare another couple of compat syscalls. compat_sys_signalfd and compat_sys_timerfd need declarations before PowerPC can wire them up. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit a34be83a9cfa15d596bfeb498b13380f0544249f Author: Dave Jones Date: Sun May 13 19:07:46 2007 -0400 MAINTAINERS update. I've not really 'maintained' this code for years, and others are doing a much more thorough job these days. Removing myself might stem some of the crazier emails I get. Signed-off-by: Dave Jones Acked-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit d10ff3fb62bd38415c0f7be3d75d107e1f67e59a Author: Thomas Gleixner Date: Mon May 14 11:10:02 2007 +0200 timekeeping fix patch got mis-applied The time keeping code move to kernel/time/timekeeping.c broke the clocksource resume logic patch, which got applied to the old file by a fuzzy application. Fix it up and move the clocksource_resume() call to the appropriate place. Signed-off-by: Thomas Gleixner [ tssk, tssk, everybody should use --fuzz=0 ] Signed-off-by: Linus Torvalds commit 90e07d9f54c61449dd48eff82e2354d0124d4f7e Author: Nicolas Pitre Date: Sun May 13 18:03:08 2007 +0200 pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response ... and make it depend on the response flag instead of the command type. Signed-off-by: Nicolas Pitre Signed-off-by: Pierre Ossman commit fe6b4c8840c5e23fe9b8696450cee8f2e8cebffd Author: Pierre Ossman Date: Mon May 14 17:27:29 2007 +0200 mmc: use assigned major for block device The MMC block devices now have an assigned major. Make sure we actually use it. Signed-off-by: Pierre Ossman commit 6ba736a10e4ae63b38ccfee9f22b3263a6e5d050 Author: Pierre Ossman Date: Sun May 13 22:39:23 2007 +0200 sdhci: handle dma boundary interrupts When the device hits certain memory boundaries, it signals an interrupt and expects to be serviced. We don't need the feature but we need to make sure the device doesn't stall. Signed-off-by: Pierre Ossman commit c0f3b6c777af071063984fdbc4efb6c904f665f4 Author: Yoichi Yuasa Date: Sun May 13 18:23:15 2007 +0200 mmc: au1xmmc command types check from data flags This patch has changed command types check from data flags. MMC_STOP_TRANSMISSION is never passed to au1xmmc_send_command(). SEND_STOP() is used for MMC_STOP_TRANSMISSION. Signed-off-by: Yoichi Yuasa Signed-off-by: Pierre Ossman commit be35cf01a9889e82da3bbda1d7b161f036424225 Author: David S. Miller Date: Mon May 14 04:19:01 2007 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit d0842f40a025521beb48063e02a8cc57ebd075e0 Author: David S. Miller Date: Mon May 14 04:18:38 2007 -0700 [VIDEO]: XVR-500 and XVR-2500 need FB=y. Otherwise the allmodconfig build breaks. Signed-off-by: David S. Miller commit 6e46507d0178ad4b33ed3bfcc72dc6e1e8a17790 Author: David S. Miller Date: Mon May 14 03:53:47 2007 -0700 [SPARC32]: asm/system.h needs asm/smp.h To get hard_smp_processor_id() even on UP builds. Signed-off-by: David S. Miller commit 2b6d868fa62b51500dd95a036229adc4a4a7bdae Author: David S. Miller Date: Mon May 14 03:53:12 2007 -0700 [SPARC32]: Update defconfig. Signed-off-by: David S. Miller commit 19fce2b96655d2b3b758e0f783314678d89b47c5 Author: Robert Reif Date: Mon May 14 03:22:08 2007 -0700 [SPARC32]: Fix sparc32 kdebug changes. Fix recent kdebug changes to compile on sparc32. Signed-off-by: Robert Reif Signed-off-by: David S. Miller commit d831666e98b4f1e19ebdd2349735f47bf37cd293 Author: Mitsuru Chinen Date: Mon May 14 03:07:30 2007 -0700 [IPV4] SNMP: Display new statistics at /proc/net/netstat This displays the statistics specified in the updated IP-MIB RFC (RFC4293) in /proc/net/netstat. The reason why these are not displayed in /proc/net/snmp is that some existing utilities are developed under the assumption which ipstat items in /proc/net/snmp is unchanged. Signed-off-by: Mitsuru Chinen Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit ae7bf20a6316272acfcaef5d265b18aaa54b41e4 Author: Corey Mutter Date: Mon May 14 03:00:27 2007 -0700 [IPV6]: Reverse sense of promisc tests in ip6_mc_input Reverse the sense of the promiscuous-mode tests in ip6_mc_input(). Signed-off-by: Corey Mutter Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 3e5c2d3bdbe2c047b9853c4248f881f5ac645c89 Author: Jamal Hadi Salim Date: Mon May 14 02:57:19 2007 -0700 [NET_SCHED]: prio qdisc boundary condition This fixes an out-of-boundary condition when the classified band equals q->bands. Caught by Alexey Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 9ac6d4a4b85004dbb907f1d3b34412afe16f3758 Author: David S. Miller Date: Mon May 14 02:56:03 2007 -0700 [SPARC64]: Accept ebus_bus_type for generic DMA ops. Based upon a bug report by Meelis Roos. Signed-off-by: David S. Miller commit 6253db055eb62a1bd0a18a1d8489565303b2b1dd Author: Herbert Xu Date: Mon May 14 02:19:11 2007 -0700 [IPSEC]: Don't warn if high-order hash resize fails Multi-page allocations are always likely to fail. Since such failures are expected and non-critical in xfrm_hash_alloc, we shouldn't warn about them. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b5505c6e1071b32176c7548a3aaf0be49f7c763e Author: Herbert Xu Date: Mon May 14 02:15:47 2007 -0700 [IPSEC]: Check validity of direction in xfrm_policy_byid The function xfrm_policy_byid takes a dir argument but finds the policy using the index instead. We only use the dir argument to update the policy count for that direction. Since the user can supply any value for dir, this can corrupt our policy count. I know this is the problem because a few days ago I was deleting policies by hand using indicies and accidentally typed in the wrong direction. It still deleted the policy and at the time I thought that was cool. In retrospect it isn't such a good idea :) I decided against letting it delete the policy anyway just in case we ever remove the connection between indicies and direction. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 17f34f0ec96783851abcabf9878f8237ac67e4e7 Author: David S. Miller Date: Mon May 14 02:01:52 2007 -0700 [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling. Signed-off-by: David S. Miller commit ec6fb1ad84551741c14a05918cc0e04dea928fc0 Author: David S. Miller Date: Sun May 13 23:52:14 2007 -0700 [SCSI]: Add help text for SCSI_ESP_CORE. Signed-off-by: David S. Miller commit 3049f89df13bb8f5ded8737631a6c2dd6209b5ca Author: David S. Miller Date: Sun May 13 22:22:47 2007 -0700 [SPARC] SBUS: display7seg.c needs asm/io.h Signed-off-by: David S. Miller commit 4b5dff76a70cb1d8b935b8b93fe0df0bbe66640d Author: David S. Miller Date: Sun May 13 22:22:13 2007 -0700 [SPARC] SBUS: bbc_i2c.c needs asm/io.h Signed-off-by: David S. Miller commit 49d23cfcec5d36a91e118d28148d353bf8f0bc03 Author: David S. Miller Date: Sun May 13 22:01:18 2007 -0700 [SPARC64]: Be more resiliant with PCI I/O space regs. If we miss on the ranges, just toss the translation up to the parent instead of failing. Signed-off-by: David S. Miller commit 7a05b591a3de20466a775f62369a42ea0fe1345d Author: David S. Miller Date: Sun May 13 21:27:37 2007 -0700 [SERIAL] SUNHV: Add an ID string. The 'compatible' property can be SUNW,sun4v-console as well as 'qcn'. Signed-off-by: David S. Miller commit 51a41e7d39ce0da1198837aaa495fe6dbcc4f802 Author: Paul Mundt Date: Mon May 14 10:15:18 2007 +0900 sh64: Add .gitignore entry for syscalltab. Signed-off-by: Paul Mundt commit 6c645ac72582bacb85b90a1cf88e81a13045aba4 Author: Paul Mundt Date: Mon May 14 09:55:35 2007 +0900 sh64: generic quicklist support. Signed-off-by: Paul Mundt commit e827f20f1d34e91fbbb0df4674ddd8c3aad517da Author: Paul Mundt Date: Mon May 14 09:14:29 2007 +0900 sh64: Update cayman defconfig. Signed-off-by: Paul Mundt commit 2f32834a32dfc289ea73839dbcb98d135742947b Author: Paul Mundt Date: Mon May 14 09:13:54 2007 +0900 sh64: Fixup sh-sci build. sh-sci needs asm/sci.h, borrow this from sh so we can build again. Signed-off-by: Paul Mundt commit c18fe9a0467afaec7de05ec76cd994ae7c866760 Author: Paul Mundt Date: Mon May 14 09:12:39 2007 +0900 sh64: ppoll/pselect6() and restartable syscalls. This patch was hanging around for some time while we were waiting for the compiler situation to improve.. now that all is well again, finally merge it. Signed-off-by: Paul Mundt commit 599c26d32950c33bdd2a5ac6939bfe15ecf057e0 Author: Paul Mundt Date: Mon May 14 09:10:46 2007 +0900 sh64: dma-mapping updates. Follow the noncoherent changes from sh. Signed-off-by: Paul Mundt commit a226d33abccff1959cec911da4143ea06ab22052 Author: Paul Mundt Date: Mon May 14 09:10:01 2007 +0900 sh64: Fixups for the irq_regs changes. A few interrupt handlers were never updated, fix them up. We were missing the irq_regs conversion also, so do that at the same time. Signed-off-by: Paul Mundt commit 6b5d1a0a2ff4fc5a26029f62eef033224ce0fa97 Author: Paul Mundt Date: Mon May 14 09:07:27 2007 +0900 sh64: Wire up many new syscalls. This has suffered a bit of bitrot, so we're a bit behind on the syscalls. There were a few that were wrapped incorrectly as well, caught by the syscall checker. Fix them all up. Signed-off-by: Paul Mundt commit 0a354775af0d3e84158ff87115bdb022b2a517ee Author: Simon Arlott Date: Mon May 14 08:25:48 2007 +0900 spelling fixes: arch/sh64/ Spelling fixes in arch/sh64/. Signed-off-by: Simon Arlott Signed-off-by: Paul Mundt commit 47e77eeecf0b7892bba8a697c228ab846fea7a0f Author: Milind Arun Choudhary Date: Mon May 14 08:24:59 2007 +0900 sh64: ROUND_UP macro cleanup in arch/sh64/kernel/pci_sh5.c ROUND_UP macro cleanup, use ALIGN where ever appropriate. Signed-off-by: Milind Arun Choudhary Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit bbdfff86a8f0c91ad8b6dedf74bc14de4ba39679 Author: Gabriel Mansi Date: Mon May 7 18:55:13 2007 -0300 [AGPGART] Fix wrong ID in via-agp.c there is a wrong id in drivers/char/agp/via-agp.c #define PCI_DEVICE_ID_VIA_CX700 0x8324 It must be 0x0324 Notice that PCI_DEVICE_ID_VIA_CX700 is also used in drivers/i2c/busses/i2c-viapro.c and drivers/ide/pci/via82cxxx.c So, I think that constant must be renamed to avoid conflicting. I attached a proposed patch. Signed-off-by: Dave Jones commit dc2585eb478cfeb45b3d6e235ac7b5918fb859f7 Author: Daniel Drake Date: Wed May 2 23:19:05 2007 +0100 [CPUFREQ] powernow-k7: fix MHz rounding issue with perflib When the PST tables are broken, powernow-k7 uses ACPI's processor_perflib to deduce the available frequency multipliers from the _PSS tables. Upon frequency change, processor_perflib performs some verification on the frequency (checks that it's within allowable bounds). powernow-k7 deals with absolute frequencies in KHz, whereas perflib only deals with MHz values. When performing the above verification, perflib multiplies the MHz values by 1000 to obtain the KHz value. We then end up with situations like the following: - powernow-k7 multiplies the multiplier by the FSB, and obtains a value such as 1266768 KHz - perflib belives the same state has frequency of 1266 MHz - acpi_processor_ppc_notifier calls cpufreq_verify_within_limits to verify that 1266768 is in the allowable range of 0 to 1266000 (i.e. 1266 * 1000) - it's not, so that frequency is rejected - the maximum CPU frequency is not reachable This patch solves the problem by rounding up the MHz values stored in perflib's tables. Additionally it corrects a broken URL. It also fixes http://bugzilla.kernel.org/show_bug.cgi?id=8255 although this case is a bit different: the frequencies in the _PSS tables are wildly wrong, but we get better results if we force ACPI to respect the fsb * multiplier calculations (even though it seems that the multiplier values aren't entirely correct either). Signed-off-by: Daniel Drake Signed-off-by: Dave Jones commit 705962ccc9d21a08b74b6b6e1d3cf10f98968a67 Author: Al Viro Date: Sun May 13 05:52:32 2007 -0400 fix deadlock in loop.c ... doh Jeremy Fitzhardinge noted that the recent loop.c cleanups worked, but cause lockdep to complain. Ouch. OK, the deadlock is real and yes, I'm an idiot. Speaking of which, we probably want to s/lock/pin/ in drivers/base/map.c to avoid such brainos again. And yes, this stuff needs clear documentation. Will try to put one together once I get some sleep... Signed-off-by: Al Viro Cc: Jeremy Fitzhardinge Signed-off-by: Linus Torvalds commit 30046e5885848fe5c2c66177dca6b277323e31ab Author: Dave Jones Date: Sun May 13 11:55:14 2007 -0400 [CPUFREQ] Support rev H AMD64s in powernow-k8 Reported-by: Calvin Dodge Signed-off-by: Dave Jones commit 20eebcf09c2d329e4dcdd765634c0a524195e16d Author: Roland Dreier Date: Sun May 13 08:54:18 2007 -0700 mlx4_core: Remove unused doorbell_lock struct mlx4_priv.doorbell_lock is never used, so delete it. Signed-off-by: Roland Dreier commit f550d94cf9f86bc54e31dae2aee1a03d678c6e7f Author: Paul Mundt Date: Thu May 10 12:50:28 2007 +0900 net: Trivial MLX4_DEBUG dependency fix. CONFIG_MLX4_DEBUG works out to a def_bool y for those that have CONFIG_EMBEDDED set. Make it depend on MLX4_CORE. Signed-off-by: Paul Mundt Signed-off-by: Roland Dreier commit 78c129b949bdee21dd996ac5f5cfc655cd5bd42e Author: Haavard Skinnemoen Date: Sun May 13 16:33:33 2007 +0200 [AVR32] Wire up signalfd, timerfd and eventfd Signed-off-by: Haavard Skinnemoen commit 9caebec7b8093574fca5a334a1939530872d75e3 Author: Christoph Hellwig Date: Sat May 12 17:56:11 2007 +0200 [AVR32] optimize pagefault path Avoid the costly notifier list in the pagefault path and call the kprobes code directly. The same change went into the 2.6.22 cycle for powerpc, 2s390 and sparc64 already. Signed-off-by: Christoph Hellwig Signed-off-by: Haavard Skinnemoen commit 5d1938c83ca826891a02badef7c9ea8ed57e01a2 Author: Haavard Skinnemoen Date: Sun May 13 16:05:59 2007 +0200 [AVR32] Remove bogus comment in arch/avr32/kernel/irq.c The comment at the top of arch/avr32/kernel/irq.c doesn't really make sense anymore since most of the actual interrupt handling code is elsewhere. Signed-off-by: Haavard Skinnemoen commit 72fdbdce3d52282f8ea95f512e871791256754e6 Author: Simon Arlott Date: Fri May 11 14:55:43 2007 -0700 [IA64] spelling fixes: arch/ia64/ Spelling and apostrophe fixes in arch/ia64/. Signed-off-by: Simon Arlott Signed-off-by: Tony Luck