commit 3bedff1d73b86e0cf52634efb447e9ada08f2cc6 Author: Linus Torvalds Date: Sat Nov 19 19:25:03 2005 -0800 Linux v2.6.15-rc2 commit 17514e8a6f1836a5c95b1f18d2bc0493ad732cf0 Author: Bartlomiej Zolnierkiewicz Date: Sat Nov 19 22:24:35 2005 +0100 [PATCH] ide: add missing __init tags to device drivers Also remove bogus comments for idefloppy_init() and idetape_init(). commit e07bc7096424b977e53a16d72ec02645389107ba Author: Bartlomiej Zolnierkiewicz Date: Sat Nov 19 22:17:55 2005 +0100 [PATCH] ide: remove dead code from flagged_taskfile() flagged_taskfile() is called from execute_drive_cmd() (the only user) only if args->tf_out_flags.all != 0. commit c0bc113373d94ebd89d0d024421df8aac60ed08a Author: Bartlomiej Zolnierkiewicz Date: Sat Nov 19 22:04:10 2005 +0100 [PATCH] ide: remove dead DEBUG_TASKFILE code commit 071ffcc0f7dd8df871f443be3f5059f05da528e2 Author: Bartlomiej Zolnierkiewicz Date: Sat Nov 19 22:01:35 2005 +0100 [PATCH] ide: remove unused ide_action_t:ide_next commit 84e7b9e94b474d40582090b7e09139f0029cff2c Author: Bartlomiej Zolnierkiewicz Date: Sat Nov 19 21:54:04 2005 +0100 [PATCH] ide: remove duplicate documentation for ide_do_drive_cmd() Remove duplicate documentation for ide_do_drive_cmd() from , this function is already documented in ide-io.c. commit 14351f8e573442e2437d4b177fa10075aaefd5c9 Author: Aurelien Jarno Date: Sat Nov 19 21:43:45 2005 +0100 [PATCH] sis5513: enable ATA133 for the SiS965 southbridge Signed-off-by: Aurelien Jarno commit 4f1d774aadfc5a6ed1545dca180f66ab6d0f543d Author: Mathias Kretschmer Date: Sat Nov 19 21:32:38 2005 +0100 [PATCH] via82cxxx: add VIA VT6410 IDE support From: Mathias Kretschmer Signed-off-by: Daniel Drake Acked-by: Alan Cox Signed-off-by: Andrew Morton commit 832f4ede791ae0a96dcbb231ccb181ad7a54bfc2 Author: Russell King Date: Sat Nov 19 11:26:17 2005 +0000 [SERIAL] Remove unused variable in sa1100.c Since the spinlock was removed from sa1100_start_tx(), the "flags" variable becomes redundant. Remove it. Signed-off-by: Russell King commit b63d4f0fb80918ab37b6c0ee1adcd49e05c9994c Author: Russell King Date: Sat Nov 19 11:10:35 2005 +0000 [SERIAL] Fix status reporting with PL011 serial driver The receiver status register reports latched error conditions, which must be cleared by writing to it. However, the data register reports unlatched conditions which are associated with the current character. Use the data register to interpret error status rather than the RSR. Signed-off-by: Russell King commit 54c4e6b5fee0347ab81e2c2fe4239c455c3422ae Author: Paul Mackerras Date: Sat Nov 19 21:24:55 2005 +1100 powerpc: Fix bug in timebase synchronization on 32-bit SMP powermac We were using udelay in the loop on the primary cpu waiting for the secondary cpu to take the timebase value. Unfortunately now that udelay uses the timebase, and the timebase is stopped at this point, the udelay never terminated. This fixes it by not using udelay, and increases the number of loops before we time out to compensate. Signed-off-by: Paul Mackerras commit a6c61e9dfdd0adf8443932cfc43b0c1e25036ad5 Author: Daniel Jacobowitz Date: Sat Nov 19 10:01:07 2005 +0000 [ARM] 3168/1: Update ARM signal delivery and masking Patch from Daniel Jacobowitz After delivering a signal (creating its stack frame) we must check for additional pending unblocked signals before returning to userspace. Otherwise signals may be delayed past the next syscall or reschedule. Once that was fixed it became obvious that the ARM signal mask manipulation was broken. It was a little bit broken before the recent SA_NODEFER changes, and then very broken after them. We must block the requested signals before starting the handler or the same signal can be delivered again before the handler even gets a chance to run. Signed-off-by: Daniel Jacobowitz Signed-off-by: Russell King commit 0212ddd839470f7a54cccccbaecd4833b4123da2 Author: Paul Mackerras Date: Sat Nov 19 20:50:46 2005 +1100 powerpc: Merge spinlock.h The result is mostly similar to the original ppc64 version but with some adaptations for 32-bit compilation. include/asm-ppc64 is now empty! Signed-off-by: Paul Mackerras commit 21a6290220679d94912a068c75db2c5cd9c6552a Author: Paul Mackerras Date: Sat Nov 19 20:47:22 2005 +1100 powerpc: move include/asm-ppc64/ptrace-common.h to arch/powerpc/kernel It's only used by arch/powerpc/kernel/ptrace{,32}.c. Signed-off-by: Paul Mackerras commit f8ef2705969e0409efedeb889445da67806ba9ea Author: Paul Mackerras Date: Sat Nov 19 20:46:04 2005 +1100 powerpc: Merge pci.h This involves some minor changes: a few unused functions that the ppc32 pci.c provides are no longer declared here or exported; pcibios_assign_all_busses now just refers to the pci_assign_all_buses variable on both 32-bit and 64-bit; pcibios_scan_all_fns is now just 0 instead of a function that always returns 0 on 64-bit. Signed-off-by: Paul Mackerras commit 047ea7846565917c4a666635fa1fa4b5c587cd55 Author: Paul Mackerras Date: Sat Nov 19 20:17:32 2005 +1100 powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc For these, I have just done the lame-o merge where the file ends up looking like: #ifndef CONFIG_PPC64 #include #else ... contents from asm-ppc64/foo.h #endif so nothing has changed, really, except that we reduce include/asm-ppc64 a bit more. Signed-off-by: Paul Mackerras commit 800fc3eeb0eed3bf98d621c0da24d68cabcf6526 Author: David Gibson Date: Wed Nov 16 15:43:48 2005 +1100 [PATCH] powerpc: Remove imalloc.h asm-ppc64/imalloc.h is only included from files in arch/powerpc/mm. We already have a header for mm local definitions, arch/powerpc/mm/mmu_decl.h. Thus, this patch moves the contents of imalloc.h into mmu_decl.h. The only exception are the definitions of PHBS_IO_BASE, IMALLOC_BASE and IMALLOC_END. Those are moved into pgtable.h, next to similar definitions of VMALLOC_START and VMALLOC_SIZE. Built for multiplatform 32bit and 64bit (ARCH=powerpc). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit e53566409c38d38680cc02299fa9fa5fe8623e9f Author: Benjamin Herrenschmidt Date: Fri Nov 18 17:18:15 2005 +1100 [PATCH] powerpc: Fix setting MPIC priority Trying to set the priority would just disable the interrupt due to an incorrect mask used. We rarely use that call, in fact, I think only in the powermac code for the cmd-power key combo that triggers xmon. So it got unnoticed for a while. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit bcb6ad1f5adb267c7b509f83e8edb16cc59d8500 Author: David S. Miller Date: Fri Nov 18 14:50:20 2005 -0800 [COMPAT]: EXT3_IOC_SETVERSION is _IOW() not _IOR(). Noticed by Helge Deller. Signed-off-by: David S. Miller commit eabc77935d8d2a761c88b9cbb6313bd54b6ddbb3 Author: Roland Dreier Date: Fri Nov 18 14:18:26 2005 -0800 IB/umad: make sure write()s have sufficient data Make sure that userspace passes in enough data when sending a MAD. We always copy at least sizeof (struct ib_user_mad) + IB_MGMT_RMPP_HDR bytes from userspace, so anything less is definitely invalid. Also, if the length is less than this limit, it's possible for the second copy_from_user() to get a negative length and trigger a BUG(). Signed-off-by: Roland Dreier commit 6593178dd46d64a5bcb0402a4f3acd95b0687abd Author: James Bottomley Date: Fri Nov 18 23:13:33 2005 +0100 [PATCH] ide: fix ide_toggle_bounce() to not try to bounce if we have an IOMMU The following patch fixes a crash caused by attempting to bounce buffer when an IDE CD-ROM is used on a machine with an IO-MMU. [At least, this patch fixes things so I can use my IDE CD-ROM behind an ns87415 on a HP PA-RISC workstation.] Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit c37ea218cb43c67bf1578f5e535fcc3a751018ef Author: Ralf Baechle Date: Fri Nov 18 23:11:24 2005 +0100 [PATCH] ide: make comment match reality Signed-off-by: Ralf Baechle commit 48fd0d1fdd357caa2de8cb4ce6af810df7535f43 Author: Michael S. Tsirkin Date: Fri Nov 18 14:11:17 2005 -0800 IB/mthca: Safer max_send_sge/max_recv_sge calculation Calculation of QP capabilities still isn't exactly right in mthca: max_send_sge/max_recv_sge fields returned in create_qp can exceed the handware supported limits. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 1e39dead2bfa8023bcdee4f1e5e6c933aff24e20 Author: Amit Gud Date: Fri Nov 18 23:03:19 2005 +0100 [PATCH] cs5520: fix return value of cs5520_init_one() From: Amit Gud Patch follows from the suggestions by AC and Felipe W Damasio for fixing the return codes from IDE drivers. [ bart: fix coding style while at it ] Signed-off-by: Amit Gud Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan commit bf4c796df61c5b3772709bf0fd62296e0ae662d7 Author: Jeff Garzik Date: Fri Nov 18 22:55:47 2005 +0100 [PATCH] siimage: docs urls Signed-off-by: Jeff Garzik commit ec0fb4bd31e1ef60aa26798f594265a9ad061f21 Author: Thibaut VARENE Date: Fri Nov 18 22:51:48 2005 +0100 [PATCH] aec62xxx: remove all dead (#if0'd) code Signed-off-by: Thibaut VARENE commit fba51bae8c3797034f497ed68f4ed120a903f941 Author: Thibaut VARENE Date: Fri Nov 18 22:37:37 2005 +0100 [PATCH] pmac IDE: don't release empty interfaces From: Thibaut VARENE Cleaning up the hwif without knowing its previous state in pmac.c is a big and potentially dangerous job, and there seems to be no generic code interface that would provide either a way to properly release an hwif or to clean it up. Fixes OOPS for empty PMAC interface and add-on PCI controller. Acked-by: Benjamin Herrenschmidt commit 2fefef1828ded4df17cfb51481b9e0782d2b3ce2 Author: Alexey Dobriyan Date: Fri Nov 18 22:22:21 2005 +0100 [PATCH] alim15x3: use KERN_WARNING Signed-off-by: Alexey Dobriyan commit e670dfb9a4f9e136da44db167da75b2365f7cebb Author: Kyle McMartin Date: Fri Nov 18 16:21:12 2005 -0500 [PARISC] Update CREDITS entries Update Randolph Chung's location, and add Thibaut Varene. Signed-off-by: Randolph Chung Signed-off-by: Thibaut Varene Signed-off-by: Kyle McMartin commit 21b3d1d792af367854e61ee05dd9b2c931b60fed Author: Matthew Wilcox Date: Fri Nov 18 16:20:10 2005 -0500 [PARISC] Mark hisax and pcbit ISDN drivers as not for parisc These drivers do not compile on big endian systems, and parisc is big endian. Also mark some as broken on m68k as well. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit cc3f7ca51abb68b6ba0da719f56e33efcc2f450b Author: Hanna Linder Date: Fri Nov 18 22:19:15 2005 +0100 [PATCH] alim15x3: replace pci_find_device() with pci_dev_present() From: Hanna Linder The dev returned from pci_find_device() was not used so it can be replaced with pci_dev_present(). Compile tested. Signed-off-by: Hanna Linder Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan commit 41df894007c5607b3892336fd72024c4dfa35bdf Author: Matthew Wilcox Date: Fri Nov 18 16:18:40 2005 -0500 [PARISC] Mention PA-RISC in NS87415 help Mention PA-RISC in NS87415 help. PA-RISC [BCJ]xxx0 workstations come with NS87415 integrated for their CD-ROM drives. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 305f5167f1e9d832b332933979b6b5e3cc68ce73 Author: Matthew Wilcox Date: Fri Nov 18 16:17:50 2005 -0500 [PARISC] Make Serial MUX depend on a specific bus type. Depend on GSC, not PARISC. Machines without GSC don't have a MUX. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 9ab8851549fb9ed570013c33e0786a3fd084be41 Author: Matthew Wilcox Date: Fri Nov 18 16:16:42 2005 -0500 [PARISC] Fix compile warning caused by conflicting types of expand_upwards() Fix compile warning caused by conflicting types of expand_upwards. IA64 requires it to not be static inline, as it's used outside mm/mmap.c Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 4ef3b8f4a5c056d5f784725974a530d1a7b4a811 Author: Laurent Riffard Date: Fri Nov 18 22:15:40 2005 +0100 [PATCH] ide: remove ide_driver_t.owner field The structure ide_driver_t have a .owner field which is a duplicate of .gendriver.owner field (.gen_driver is a struct device_driver). This patch removes ide_driver_t's owner field. Signed-off-by: Laurent Riffard commit 7462cbff7d4c2dc0d182613fb4e801efb29b90ac Author: Daniel Drake Date: Fri Nov 18 22:09:45 2005 +0100 [PATCH] via82cxxx IDE: support multiple controllers Support multiple controllers in the via82cxxx IDE driver. Cable detection and ISA bridge finding have been moved into their own functions. Signed-off-by: Daniel Drake commit 861e76a8ab7ba64a74c567fa8c4d1d38c4dfdd24 Author: Daniel Drake Date: Fri Nov 18 22:08:29 2005 +0100 [PATCH] via82cxxx IDE: remove /proc/via entry This entry adds needless complication to the driver as it requires the use of global variables to be passed into via_get_info(), making things quite ugly when we try and make this driver support multiple controllers simultaneously. This patch removes /proc/via for simplicity. On 10/13/05, Daniel Drake wrote: > Per Bart's suggestion, I've created a user-space app which shows identical > data (and doesn't even rely on the via82cxxx IDE driver). > > http://www.reactivated.net/software/viaideinfo/ > > So, I think we should be clear to drop /proc/ide/via now. Signed-off-by: Daniel Drake commit 6f5a0f7c955d3567f800fa36f978758cb5b99aa2 Author: mikem Date: Fri Nov 18 22:05:36 2005 +0100 [PATCH 3/3] cciss: add put_disk into cleanup routines Jeff Garzik pointed me to his code to see how to remove a disk from the system _properly_. Well, here it is... Every place we remove disks we are now testing before calling del_gendisk or blk_cleanup_queue and then call put_disk. Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit 15534d3803993345d8db32246ec329d8f83502e1 Author: Jens Axboe Date: Fri Nov 18 22:02:44 2005 +0100 [PATCH 2/3] cciss: bug fix for BIG_PASS_THRU Applications using CCISS_BIG_PASSTHRU complained that the data written was zeros. The problem is that the buffer is being cleared after the user copy, unless the user copy has failed... Correct that logic. Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit 7f0d50391adf371a0e66da0a1a44ba5cc6744ee8 Author: mikem Date: Fri Nov 18 22:00:17 2005 +0100 [PATCH 1/3] cciss: bug fix for hpacucli This patch fixes a bug that breaks hpacucli, a command line interface for the HP Array Config Utility. Without this fix the utility will not detect any controllers in the system. I thought I had already fixed this, but I guess not. Thanks to all who reported the issue. Please consider this this inclusion. Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit eb97b73d75d5c9af7c78c05106de9e3fdc4455ab Author: Coywolf Qi Hunt Date: Wed Nov 16 15:27:24 2005 +0100 [BLOCK] new block/ directory comment tidy Some leftover comments referring to drivers/block that are now block/. They don't add any information we don't already have, so kill them. Signed-off-by: Coywolf Qi Hunt Signed-off-by: Jens Axboe commit f7492f17f2123f0f4db5f9e8ba89867a7b352658 Author: Jeff Garzik Date: Fri Nov 18 15:06:59 2005 -0500 [wireless hermes] build fix commit e2b1be56c5656902744c2b52e8304126a40bb609 Author: Jeff Garzik Date: Fri Nov 18 14:04:23 2005 -0500 [libata sata_mv] update copyright, driver version commit eaf8f53bc001d20aa59aa4519b71f11a1cc7f945 Author: James Ketrenos Date: Sat Nov 12 12:50:12 2005 -0600 [PATCH] ipw2100: Fix 'Driver using old /proc/net/wireless...' message ipw2100: Fix 'Driver using old /proc/net/wireless...' message Wireless extensions moved the get_wireless_stats handler from being in net_device into wireless_handler. A prior instance of this patch resolved the issue for the ipw2200. This one fixes it for the ipw2100. Signed-off-by: Benoit Boissinot Signed-off-by: James Ketrenos Signed-off-by: John W. Linville commit a7a461b32fdff1e7db42b50db53840e4fa978384 Author: John W. Linville Date: Mon Nov 7 13:24:59 2005 -0500 [PATCH] fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx Change CONFIG_FEC_8XX to depend on CONFIG_8xx instead of CONFIG_FEC. CONFIG_FEC depends on ColdFire CPUs, which does not apply for the PPC 8xx processors. Signed-off-by: John W. Linville commit 8907e94be2661be940c622232d6ce5ae938f10c3 Author: Greg Kroah-Hartman Date: Fri Nov 18 09:31:15 2005 -0800 [PATCH] update Documentation/00-INDEX Update the index file with descriptions of the stable_api_nonsense.txt and stable_kernel_rules.txt files. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d36cc9d0813f813408a1f0bed5e8ced358bb43bf Author: Greg Kroah-Hartman Date: Fri Nov 18 09:31:11 2005 -0800 [PATCH] Add HOWTO do kernel development document to the Documentation directory Here's a document that describes the process and procedures of how to do Linux kernel development. It has gone through a number of rounds of review on the linux-kernel mailing list, and contains contributions and help from Paolo Ciarrocchi, Randy Dunlap, Gerrit Huizenga, Pat Mochel, Hanna Linder, Kay Sievers, Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi Kleen, Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop, David A. Wheeler, Junio Hamano, Michael Kerrisk, and Alex Shepard. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 6fb0425b99e00d4d73012264785c662e1783755f Author: Jody McIntyre Date: Fri Nov 18 09:31:06 2005 -0800 [PATCH] Add SCM info to MAINTAINERS Add tree information to MAINTAINERS file. Signed-off-by: Jody McIntyre Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit cea00da3972806d213a7dbe1b98e889435385e6b Author: Andrew Morton Date: Wed Nov 9 11:30:51 2005 -0800 [PATCH] git-netdev-all-ieee80211_get_payload-warning-fix include/net/ieee80211.h: In function `ieee80211_get_payload': include/net/ieee80211.h:1046: warning: control reaches end of non-void function Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c5b42f343d19d0a04782db0dde5b128dd282f95c Author: Gabriel A. Devenyi Date: Sat Nov 12 16:00:46 2005 -0500 [PATCH] drivers/net/wireless/hermes.c unsigned int comparision hermas_bap_pread, hermes_bap_pwrite, and hermes_bap_pwrite_pad all have a parameter "len" that is declared unsigned, but checked for a value less than zero. Auditing the callers, it is possible for len to be passed a negative value, so len should be an int. Thanks to LinuxICC (http://linuxicc.sf.net) Signed-off-by: Gabriel A. Devenyi Signed-off-by: Jeff Garzik commit cbf7c42b727826770a44c0a10ef3663da08e64bc Author: Roger While Date: Mon Nov 14 11:50:46 2005 +0100 [PATCH] prism54 : Remove extraneous udelay/register read In isl_38xx.c In routine isl38xx_trigger-device Move unnecessary udelay/register read. This is only required when hand-compiling the driver and setting VERBOSE > SHOW_ERROR_MESSAGES Signed-off-by: Roger While Signed-off-by: Jeff Garzik commit 344547093274c8bdb87becb939e5c8ab009ebfe6 Author: Ralf Baechle Date: Mon Nov 14 00:19:44 2005 +0000 [PATCH] SAA9730: Add missing header bits. This header file patch was missing from the recent SAA9730 patch. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 0c0abbc58011e977921eae9037668452bef80265 Author: Ralf Baechle Date: Mon Nov 14 00:16:29 2005 +0000 [PATCH] au1000_eth: Include Signed-off-by: Ralf Baechle The Au1000 ethernet driver references plenty of CONFIG_* symbols. Signed-off-by: Jeff Garzik commit 70f1e002cfaad708ac561bcc6700dc50888999f5 Author: Ralf Baechle Date: Sun Nov 13 10:13:05 2005 +0000 [PATCH] IOC3: Replace obsolete PCI API Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 620d9aa95b7910da07912340971bc2d9b2497382 Author: John W. Linville Date: Wed Nov 16 16:09:53 2005 -0500 [PATCH] i82593.h: make header comment GPL-compatible Signed-off-by: John W. Linville Signed-off-by: Jeff Garzik commit 2afecc047e9077d8dc9e312b32e944955e71ce53 Author: Jesse Brandeburg Date: Mon Nov 14 13:15:49 2005 -0800 [PATCH] e100: re-enable microcode with more useful defaults For the four versions of hardware that we (currently) support microcode download on, the default configuration of our receive interrupt mitigation microcode was too aggressive, and caused unnecessary delays when pinging, and low(er) throughput on single connection latency sensitive performance tests. This code adds microcode support, and sets the defaults to more reasonable settings. It also explains the functionality in the code in more detail. Compile and load tested, shows expected behavior for slight delay of ping packets (1-2ms) when ucode is loaded, and decent interrupt moderation for small packets, while maintaining good throughput. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Garzik commit c0ab424238ceabcaa3a2948f283bcb94f6979c93 Author: Tejun Heo Date: Fri Nov 18 14:22:03 2005 +0900 [PATCH] sil24: make error_intr less verbose sil24_error_intr logs all error interrupts. ATAPI devices generates many harmless errors which can be ignored and all serious ones are reported via sense data by SCSI layer. Don't log device errors from ATAPI devices. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 69ad185fa139b8fff2442d89440e382679d51f0f Author: Tejun Heo Date: Fri Nov 18 14:16:45 2005 +0900 [PATCH] sil24: add ATAPI support This patch implements ATAPI support for sil24 and bumps driver version to 0.23. Signed-off-by: Tejun Heo -- Jeff, it has been converted to use ->dev_config as pointed out. Signed-off-by: Jeff Garzik commit ca45160db70661a006d884df07f82c9b51d27a52 Author: Tejun Heo Date: Fri Nov 18 14:14:01 2005 +0900 [PATCH] sil24: use SRST for phy_reset There seems to be no way to obtain device signature from sil24 after SATA phy reset and SRST is needed anyway for later port multiplier suppport. This patch converts sil24_phy_reset to use SRST instaed. Signed-off-by: Tejun Heo -- Jeff, I didn't remove the 10ms sleep just to be on the safe side. I think we can live with 10ms sleep on SRST. Signed-off-by: Jeff Garzik commit 7d1ce682d08625258524d23ef5eb9e7ae261c1d0 Author: Tejun Heo Date: Fri Nov 18 14:09:05 2005 +0900 [PATCH] sil24: add sil24_restart_controller When an error condition is raised by device via D2H FIS or SDB. sil24 controller should be restarted by setting PORT_CS_INIT and waiting until PORT_CS_RDY is asserted instead of resetting the controller. This patch implements sil24_restart_controller for those cases. This patch also makes sure that PORT_CS_RDY is asserted on sil24_reset_controller completion. Signed-off-by: Tejun Heo -- Jeff, delay is reduced to 1us and cnt increased to 10k. My sil3124 turns on PORT_CS_RDY on the second iteration even without any delay. I think 10k * 1us should be more than enough. I tried to convert both restart and reset to use msleep's with work queue, but if we do that, host_set lock should be released after initiating restart or reset, leading to race condition among reset/restart, other interrupts and timeout. Implementing synchronization among those in low-level driver doesn't seem right. Well, reduced timeout should work for the time being. Thanks. Signed-off-by: Jeff Garzik commit e52542443aa9be15439e9879baf6d41b290e94db Author: Russell King Date: Fri Nov 18 12:57:55 2005 -0500 [PATCH] smc91x: fix bank mismatch The smc91x driver relies upon register bank 2 being selected whenever the interrupt handler is called. This isn't always so, especially if we have a link change event during PHY configuration. This results in register bank 0 being selected when the interrupt handler is called, causing the wrong registers to be read for the IRQ mask and status. In turn, this causes us to spin with a permanently asserted IRQ. The patch ensures that smc_phy_configure always exits with register bank 2 selected. Signed-off-by: Russell King Signed-off-by: Nicolas Pitre Signed-off-by: Jeff Garzik commit 5d0571d915f3e281f151df9a18a6a0be5a57c4b0 Author: Nicolas Pitre Date: Thu Nov 17 14:02:48 2005 -0500 [PATCH] smc91x: fix one source of spurious interrupts Not only SMC_ACK_INT(IM_TX_EMPTY_INT) in in smc_hardware_send_pkt) appears to be unnecessary (tested with an SMC91C94 and SMC91C111), but it seems to trigger spurious interrupts on some machines as well. Removed. While at it, let's log any remaining spurious interrupts if any (and clean usage of the max IRQ loop count value). Signed-off-by: Nicolas Pitre Signed-off-by: Jeff Garzik commit fc71fe40d2bedcc57d3406bf2050481f8b3441b6 Author: Martin Schwidefsky Date: Fri Nov 18 01:11:03 2005 -0800 [PATCH] s390: fix class_device_create calls in 3270 the driver Add the missing NULL argument to the class_device_create calls. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b50ce2324cecf4efc7babe31f4aa1a07f9157317 Author: Andy Whitcroft Date: Fri Nov 18 01:11:02 2005 -0800 [PATCH] ppc64 need HPAGE_SHIFT when huge pages disabled With the new powerpc architecture we don't seem to be able to disable huge pages anymore. mm/built-in.o(.toc1+0xae0): undefined reference to `HPAGE_SHIFT' make: *** [.tmp_vmlinux1] Error 1 We seem to need to define HPAGE_SHIFT to something when HUGETLB_PAGE isn't defined. This patch defines it to PAGE_SHIFT when we have no support. Signed-off-by: Andy Whitcroft Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0e485216de80046dd0d448b7cd530dbfc31402f Author: NeilBrown Date: Fri Nov 18 01:11:01 2005 -0800 [PATCH] md: fix is_mddev_idle calculation now that disk/sector accounting happens when request completes md needs to monitor the rate of requests to its devices when doing resync/recovery so that it can back-off when there is non-resync IO. It does this by comparing resync IO, which it counts, with total IO which is taken from disk_stats. disk_stats were recently changed to account sectors when a request completes instead of when it is queued. This upsets md's calculations. We could do the sync_io accounting at the end of requests too, but that has problems. If an underlying device is an md array, the accounting will still be done when the request is submitted. This could be changed for some raid levels, but it cannot be changed for raid0 or linear without substantial code changes. So instead, we increase the error that is_mddev_idle allows, up to the maximum amount of resync IO that can be in flight at any time. The calculation is current fragile as each personality as different limits for in-flight resync. This should be fixed up. For now, this simple patch fixes the problem. Increasing the error margin decreases the sensitivity to non-resync IO. To partially compensate for this, the time to wait when non-resync IO is detected is increased so that less steady IO is required to keep the resync at bay. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34ef75f09f09611b62ae11ae36c3c7b0a6a8a9cb Author: Neil Brown Date: Fri Nov 18 01:10:59 2005 -0800 [PATCH] md: don't pass a NULL file* into ->prepare_write() Some filesystems go oops. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4b32b8b010d036dc03f77b0ef2a747db0cc3588 Author: Kylene Jo Hall Date: Fri Nov 18 01:10:59 2005 -0800 [PATCH] tpm: remove PCI kconfig dependency The driver dependencies on PCI have been removed. This patch clears that up in the Kconfig file Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90612b308f2a2cc8aa08fbaf6f7184f5b7b5a855 Author: Kylene Jo Hall Date: Fri Nov 18 01:10:58 2005 -0800 [PATCH] tpm: use ioread8 and iowrite8 Use ioread8 and iowrite8 as suggested. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba3961152e7016237e15e3dfc18f08c1853d156b Author: Kylene Jo Hall Date: Fri Nov 18 01:10:57 2005 -0800 [PATCH] tpm: use flush_scheduled_work() Add the necessary flush_schedule_work calls when canceling the timer. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 966cc04b4d9d3d7a49e744888628acc36ebec5d4 Author: Vitaly Bordug Date: Fri Nov 18 01:10:55 2005 -0800 [PATCH] ppc32: add missing define for fs_enet Ethernet driver This adds the FCC_PSMR_RMII defenition, which is used in fs_enet to enable RMII mode. Signed-off-by: Vitaly Bordug Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44f080c46e84090daf81b4d142359f8e38d7c5ee Author: Matt Domsch Date: Fri Nov 18 01:10:54 2005 -0800 [PATCH] ipmi: missing NULL test for kthread On IPMI systems with BT interfaces, we don't start the kernel thread, so smi_info->thread is NULL. Test for NULL when stopping the thread, because kthread_stop() doesn't, and an oops ensues otherwise. Signed-off-by: Matt Domsch Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58bb01a9cd72eebf60d00c57b948a76aa7b85727 Author: Hans Reiser Date: Fri Nov 18 01:10:53 2005 -0800 [PATCH] re-export clear_page_dirty_for_io() 2.6.14 has this exported, and reiser4 (at least) uses it. Put things back the way they were. Signed-off-by: Vladimir V. Saveliev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 996417d2c4eb583e94553e4ede58974e0da1c38e Author: Paul E. McKenney Date: Fri Nov 18 01:10:50 2005 -0800 [PATCH] add success/failure indication to RCU torture test One issue with the RCU torture test is that the current error flagging can be lost in dmesg. This patch adds a "SUCCESS"/"FAILURE" string to the line that flags the end of the test, where it can easily be seen with "dmesg | tail" at the end of the test. Also adds tests of architecture-specific memory barriers -- or, more likely, of the RCU torture test itself. Cc: Signed-off-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2463ade2cb78224302998ee3c7dc7d53da88d258 Author: Andrey Volkov Date: Fri Nov 18 01:10:48 2005 -0800 [PATCH] Fix copy-paste bug in ohci-ppc-soc.c Fix copy-paste bug in ohci-ppc-soc.c(ohci_hcd_ppc_soc_drv_remove) Signed-off-by: Andrey Volkov Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2203d6ed448ff3b777ee6bb614a53e686b483e5b Author: Linus Torvalds Date: Fri Nov 18 07:29:51 2005 -0800 Fix ACPI processor power block initialization Properly clear the memory, and set "pr->flags.power" only if a C2 or deeper state is valid (to make the code match both the comment and previous behaviour). This fixes a boot-time lockup reported by Maneesh Soni when using "maxcpus=1". Acked-by: Maneesh Soni Signed-off-by: Linus Torvalds commit 78b09735a2f42f32c4611d92ea51755e1faae385 Author: Stephen Rothwell Date: Sat Nov 19 01:40:46 2005 +1100 powerpc: merge dma-mapping.h Signed-off-by: Stephen Rothwell commit 78baa2f8ad53968ff82ad9827b7793b3f46cba0e Author: Stephen Rothwell Date: Sat Nov 19 00:33:56 2005 +1100 ppc32: move some dma routines Every other architecture define dma_cache_{inv,wback,wback_inv} in asm/io.h and doing so brings us closer to ppc64. Signed-off-by: Stephen Rothwell commit d2c5b69099ff747f9757da2416383b9a999171b1 Author: Russell King Date: Fri Nov 18 14:22:03 2005 +0000 [ARM] Fix get_user when passed a const pointer Unfortunately, later gcc versions error out when our get_user is passed a const pointer, since we write to a temporary variable declared as typeof(*(p)) which propagates the const-ness. Signed-off-by: Russell King commit f365cfd0d8b6d8fb3583d23d48f54efa88ee8563 Author: Paul Mackerras Date: Fri Nov 18 16:41:49 2005 +1100 offb: Fix compile error on ppc32 systems The code Ben H added needs for things like pci_dev, etc. Signed-off-by: Paul Mackerras commit 8a5abdf80ecf3ad3fa052878778c7185c5911a53 Author: Paul Mackerras Date: Fri Nov 18 16:39:08 2005 +1100 powerpc: Move defconfig over and remove remaining arch/ppc64 files make defconfig will now use arch/powerpc/configs/ppc64_defconfig if running on a ppc64 system. I need to add an arch/powerpc/configs/ppc_defconfig sometime. Signed-off-by: Paul Mackerras commit 44aedfe7dedb1ba9f4f9d17f55dec5727f5ff82f Author: Paul Mackerras Date: Fri Nov 18 15:54:12 2005 +1100 powerpc: Fix a couple of compile warnings for 32-bit compiles Signed-off-by: Paul Mackerras commit 49e16b7becd6320bde51aa238c11815708f836d9 Author: Paul Mackerras Date: Fri Nov 18 15:52:38 2005 +1100 powerpc: time-of-day fixes for 32-bit CHRP systems This makes 32-bit CHRP systems use the RTAS time-of-day routines if available. It fixes a bug in the RTAS time-of-day routines where they were storing a 64-bit timebase value in an unsigned long by making those variables u64. Also, the direct-access time-of-day routines had the wrong convention for the month and year in the struct rtc_time. Signed-off-by: Paul Mackerras commit 6146eed1e972a7de93ce2e36adc5812de81e879c Author: Paul Mackerras Date: Fri Nov 18 15:47:18 2005 +1100 powerpc: Fix compile error on pSeries arising from delay.h changes pseries_dedicated_idle() was using __get_tb which used to be defined in asm/delay.h. Change it to use get_tb from asm/time.h, which is in fact exactly the same thing. Signed-off-by: Paul Mackerras commit 437a58db57c61385baaa1cb8b7fa590b6a2f1607 Author: Paul Mackerras Date: Fri Nov 18 15:43:34 2005 +1100 powerpc: Move remaining .c files from arch/ppc64 to arch/powerpc This also deletes the now-unused Makefiles under arch/ppc64. Both of the files moved over could use some merging, but for now I have moved them as-is and arranged for them to be used only in 64-bit kernels. For 32-bit kernels we still use arch/ppc/kernel/idle.c and drivers/char/generic_nvram.c as before. Signed-off-by: Paul Mackerras commit f62859bb6871c5e4a8e591c60befc8caaf54db8c Author: Mike Kravetz Date: Mon Nov 14 16:12:49 2005 -0800 [PATCH] Remove SPAN_OTHER_NODES config definition The config option SPAN_OTHER_NODES was created so that we could make pSeries numa layouts work within the DISCONTIG memory model. Now that DISCONTIG has been replaced by SPARSEMEM, we can eliminate this option. I'll be sending a separate patch to Andrew to remove the arch independent code as pSeries was the only arch that needed this. Signed-off-by: Mike Kravetz Signed-off-by: Paul Mackerras commit 5daf9071b527089b1bd5d9cb3a5354b83121550e Author: Benjamin Herrenschmidt Date: Fri Nov 18 14:09:41 2005 +1100 [PATCH] powerpc: merge align.c This patch merges align.c, the result isn't quite what was in ppc64 nor what was in ppc32 :) It should implement all the functionalities of both though. Kumar, since you played with that in the past, I suppose you have some test cases for verifying that it works properly before I dig out the 601 machine ? :) Since it's likely that I won't be able to test all scenario, code inspection is much welcome. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6defa38b3754c84cd3449447477aed81ea979407 Author: Paul Mackerras Date: Fri Nov 18 13:44:17 2005 +1100 powerpc: Fix delay functions for 601 processors My earlier merge of delay.h introduced a timebase-based udelay for 32-bit machines but also broke the 601, which doesn't have the timebase register. This fixes it by using the 601's RTC register on the 601, and also moves __delay() and udelay() to be out-of-line in arch/powerpc/kernel/time.c. These functions aren't really performance critical, after all. Signed-off-by: Paul Mackerras commit fe7bce5ef70105a6546dc9b5c354219b9f6ea991 Author: Kumar Gala Date: Thu Nov 17 17:45:40 2005 -0600 [PATCH] ppc: Fix warnings related to seq_file When we moved things around in irq.h seq_file became an issue. Fix warnings related to its usage. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 6760a1bdf56de6e1a30399d9069b94bfea59c13d Author: Kumar Gala Date: Thu Nov 17 17:05:02 2005 -0600 [PATCH] ppc: Fix MPC83xx device table The SVRs for MPC8343/E were incorrect and really the SVRs for MPC8347/E. Signed-off-by: David Updegraff Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit a097a35c9a6de6316c18a3e914c64400b5a6db57 Author: Segher Boessenkool Date: Thu Nov 17 22:22:14 2005 +0100 [PATCH] powerpc: Maple: request I/O resource. Reserve the Maple RTC I/O resource. Needed now we use genrtc. Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 68643cfb879ad8c327441f875b60981822016575 Author: Olaf Hering Date: Thu Nov 17 22:09:02 2005 +0100 [PATCH] ppc boot: replace string labels with numbers Replacing the string labels with numbers saves 117 bytes in the final zImage. These local labels are not discared. Signed-off-by: Olaf Hering arch/powerpc/boot/crt0.S | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) Signed-off-by: Paul Mackerras commit d2a33170972c5772826f7f6cc950ab69ba034667 Author: Michael Ellerman Date: Thu Nov 17 20:34:35 2005 +1100 [PATCH] powerpc: Fix typo in topology.h The fix to topology.h (5cfccd7f132432dd4705444a44b51d12ef88a85f) seems to have a typeo, struct sched_domain has an idle_idx member but not an idle_id member. I assume this is the fix. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 976164497d6d8050403c96894ad418de44ec748f Author: Kumar Gala Date: Thu Nov 17 17:45:40 2005 -0600 [PATCH] ppc: Fix warnings related to seq_file When we moved things around in irq.h seq_file became an issue. Fix warnings related to its usage. Signed-off-by: Kumar Gala Signed-off-by: Linus Torvalds commit 9e147a1cfce5ec6308b024abe425d5b4e1884a03 Author: David S. Miller Date: Thu Nov 17 16:52:51 2005 -0800 [IPV6]: Fib dump really needs GFP_ATOMIC. Revert: 8225ccbaf01b459cf1e462047a51b2851e756bc1 Based upon a report by Yan Zheng. Signed-off-by: David S. Miller commit 05b8b0fafd4cac75d205ecd5ad40992e2cc5934d Author: Roman Zippel Date: Thu Nov 17 15:22:39 2005 -0800 [NET]: Sanitize NET_SCHED protection in /net/sched/Kconfig On Thu, 17 Nov 2005, David Gómez wrote: > I found out that if i select NET_CLS_ROUTE4, save my changes and exit > menuconfig, execute again make menuconfig and go to QoS options, then the new > available options are visible. So menuconfig has some problem refreshing > contents :? No, they were there before too, but you have to go up one level to see them. It's better in 2.6.15-rc1-git5, but the menu structure is still a little messed up, the patch below properly indents all menu entries. Signed-off-by: Roman Zippel Signed-off-by: David S. Miller commit 381998241fd1fc635596f4e8ae835f0d64ca1ba2 Author: David S. Miller Date: Thu Nov 17 15:17:42 2005 -0800 [LLC]: Fix compiler warnings introduced by TX window scaling changes. Noticed by Olaf Hering. The comparisons want a u8 here (the data type on the left-hand branch is a u8 structure member, and the constant on the right-hand branch is "~((u8) 128)"), but C turns it into an integer so we get: net/llc/llc_c_ac.c: In function `llc_conn_ac_inc_npta_value': net/llc/llc_c_ac.c:998: warning: comparison is always true due to limited range of data type net/llc/llc_c_ac.c:999: warning: large integer implicitly truncated to unsigned type Fix this up by explicitly recasting the right-hand branch constant into a "u8" once more. Signed-off-by: David S. Miller commit 2fce76afdb067fa3e7f8ee33c9fe366bd65887ea Author: Harald Welte Date: Thu Nov 17 15:06:47 2005 -0800 [NETFILTER] ip_conntrack: fix ftp/irc/tftp helpers on ports >= 32768 Since we've converted the ftp/irc/tftp helpers to use the new module_parm_array() some time ago, we ware accidentially using signed data types - thus preventing those modules from being used on ports >= 32768. This patch fixes it by using 'ushort' module parameters. Thanks to Jan Nijs for reporting this bug. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d5ea655376c471731845735dfe9a0bdfbe4492e9 Author: David S. Miller Date: Thu Nov 17 15:04:34 2005 -0800 [COMPAT]: Add ext3 ioctl translations. So things like on-line resizing et al. work. Based almost entirely upon a patch by Guido Günther Signed-off-by: David S. Miller commit 02b30839220fa3ef80a34ed6ee174fa2d9937eac Author: Russell King Date: Thu Nov 17 22:43:30 2005 +0000 [ARM] Fix some corner cases in new mm initialisation Document that the VMALLOC_END address must be aligned to 2MB since it must align with a PGD boundary. Allocate the vectors page early so that the flush_cache_all() later will cause any dirty cache lines in the direct mapping will be safely written back. Move the flush_cache_all() to the second local_flush_cache_tlb() and remove the now redundant first local_flush_cache_tlb(). Signed-off-by: Russell King commit bd6af700a7191f483f41706467033588f28c8877 Author: Stephen Hemminger Date: Thu Nov 17 14:11:18 2005 -0800 [TCP]: TCP highspeed build error There is a compile error that crept in with the last patch of TCP patches. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a39cf72ceb406e152c4682c0b635a96f1439c5ed Author: Kyle McMartin Date: Thu Nov 17 16:44:57 2005 -0500 [PARISC] Make superio.c initialize before any driver needs it Convert superio_init to use PCI_FIXUP_FINAL as ohci_pci being called before superio_probe really makes a mess. superio_init will then fail to register irq 20 (the "SuperIO" irq) and BUG() because ohci_pci has stolen it before superio_fixup_irq can be moved USB to irq 1. Signed-off-by: Kyle McMartin commit 29a622dd2b577d98731d325954f328b810826cfa Author: Matthew Wilcox Date: Thu Nov 17 16:44:14 2005 -0500 [PARISC] Always spinlock tlb flush operations to ensure preempt safety Since taking a spinlock disables preempt, and we need to spinlock tlb flush on SMP for N class, we might as well just spinlock on uniprocessor machines too. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 9d7d57567c026a06f0cb2edabe75250d8f61d44a Author: Grant Grundler Date: Thu Nov 17 16:43:52 2005 -0500 [PARISC] Remove unused variable in signal.c Remove unused variable "struct siginfo si" in signal.c Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 784412f74c0f74dac8ba30a4713273423c2ae155 Author: Christoph Hellwig Date: Thu Nov 17 16:41:26 2005 -0500 [PARISC] remove drm compat ioctls handlers Remove drm compat_ioctl handlers. The drm drivers have proper compat_ioctl methods these days. Signed-off-by: Christoph Hellwig Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit ad7dd338fbb82ea54a866b369c4c9a78cfd16234 Author: Christoph Hellwig Date: Thu Nov 17 16:40:31 2005 -0500 [PARISC] move PA perf driver over to ->compat_ioctl Move PA perf driver over to ->compat_ioctl. Signed-off-by: Christoph Hellwig Acked-by: Randolph Chung Signed-off-by: Kyle McMartin commit a137ce8536f6124c42ac300be01b9b611c7db5a1 Author: Ryan Bradetich Date: Thu Nov 17 16:38:28 2005 -0500 [PARISC] Define port->timeout to fix a long msleep in mux.c This commit is in response to a bug reported by Vesa on the irc channel a couple of weeks ago. The bug was that the console would apparently hang (not return) while using the mux console. The root cause of this bug is that bash (with readline support) makes a call to the tcsetattr() glibc function with the argument TCSADRAIN. This causes the serial core in the kernel use the uart_wait_until_sent() to be called. This function verifies the mux transmit queue is empty or calls the msleep_interruptable() with a calculated timeout value that is dependant upon the port->timeout variable. The real problem here is that the port->timeout was not defined so it was defaulted to 0 and the timeout calculation performs the following calculation: char_time = (port->timeout - HZ/50) / port->fifosize; where char_time is an unsigned long. Since the serial Mux does not use interrupts, the msleep_interruptable() function waits until the timeout has been reached ... and when the port->timeout < HZ/50 this timeout will be a long time. (I have validated that the console will eventually return ... but it takes quite a while for this to happen). This patch simply sets the port->timeout on the Mux to HZ/50 to avoid this long timeout period. Signed-off-by: Ryan Bradetich Signed-off-by: Kyle McMartin commit 83aceb5b6a561c7fd7cc2d481fb55a0a2ae37c12 Author: Matthew Wilcox Date: Thu Nov 17 16:37:24 2005 -0500 [PARISC] Fix some compile problems in ptrace.c Fix some compile problems: - ret wasn't being initialised in all code paths - I'm pretty sure 'goto out' should have been 'goto out_tsk' Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 92495c0ebc99ee00651571cba6939783234f7696 Author: Ryan Bradetich Date: Thu Nov 17 16:36:52 2005 -0500 [PARISC] Compile fixups for serial/mux.c This patch does the following: * Fixes compiler warnings. * Replaces a __raw_readl call with the existing macro. Signed-off-by: Ryan Bradetich Signed-off-by: Kyle McMartin commit 08dc2ca61e683e9119ff534dfcd0fd555401fcf7 Author: James Bottomley Date: Thu Nov 17 16:35:09 2005 -0500 [PARISC] Fix our spinlock implementation We actually have two separate bad bugs 1. The read_lock implementation spins with disabled interrupts. This is completely wrong 2. Our spin_lock_irqsave should check to see if interrupts were enabled before the call and re-enable interrupts around the inner spin loop. The problem is that if we spin with interrupts off, we can't receive IPIs. This has resulted in a bug where SMP machines suddenly spit smp_call_function timeout messages and hang. The scenario I've caught is CPU0 does a flush_tlb_all holding the vmlist_lock for write. CPU1 tries a cat of /proc/meminfo which tries to acquire vmlist_lock for read CPU1 is now spinning with interrupts disabled CPU0 tries to execute a smp_call_function to flush the local tlb caches This is now a deadlock because CPU1 is spinning with interrupts disabled and can never receive the IPI Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 4269b0d371c43bc8f3c9e183847a08258587cf06 Author: Matthew Wilcox Date: Thu Nov 17 16:33:56 2005 -0500 [PARISC] Improve the error message when we get a clashing mod path Improve the error message when we get a clashing mod path, and actually display the IODC data and path for the conflicting device. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit ba5c4f1bae89eba7b03e58a5448e8b28a006d4df Author: Matthew Wilcox Date: Thu Nov 17 16:33:29 2005 -0500 [PARISC] Return PDC_OK when alloc_pa_dev fails to enumerate all devices Return PDC_OK when device registration fails so that we enumerate all subsequent devices, even when we get two devices with the same hardware path (which should never happen, but does with at least one revision of rp8400 firmware). Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit aa0eecb07f27bea25a7cbe4150822be72493e574 Author: Carlos O'Donell Date: Thu Nov 17 16:32:46 2005 -0500 [PARISC] Document some register usages in assembly files Document clobbers and args in entry.S and syscall.S. entry.S: Add comment to indicate that cr27 may recycle and EDEADLOCK detection is not 100% correct. Since this is only enabled when using ENABLE_LWS_DEBUG, the user is warned by the comment. Signed-off-by: Carlos O'Donell Signed-off-by: Kyle McMartin commit 75be99a8c597aaebf82802109cdfd1249eea951e Author: Ryan Bradetich Date: Thu Nov 17 16:29:50 2005 -0500 [PARISC] Make redirecting irq messages less noisy Make the "redirecting irq" message to not display on the console by setting the severity to KERN_DEBUG. The console was basically unusable. Signed-off-by: Ryan Bradetich Signed-off-by: Kyle McMartin commit 03afe22f074231196dcf3298f962cfc787ebbc60 Author: Grant Grundler Date: Thu Nov 17 16:29:16 2005 -0500 [PARISC] irq_affinityp[] only available for SMP builds irq_affinityp[] only available for SMP builds, make code that uses it conditional on CONFIG_SMP. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit c2ab64d09815cc4d48347ee3679658f197455a2a Author: James Bottomley Date: Thu Nov 17 16:28:37 2005 -0500 [PARISC] Add IRQ affinities This really only adds them for the machines I can check SMP on, which is CPU interrupts and IOSAPIC (so not any of the GSC based machines). With this patch, irqbalanced can be used to maintain irq balancing. Unfortunately, irqbalanced is a bit x86 centric, so it doesn't do an incredibly good job, but it does work. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 1d4c452a85503cdb4bca5925cf698b61d3aa43a0 Author: Kyle McMartin Date: Thu Nov 17 16:27:44 2005 -0500 [PARISC] Fix uniprocessor build by dummying smp_send_all_nop() Since irq.c uses smp_send_all_nop, we must define it for UP builds as well. Make it a static inline so it gets optimized away. This forces irq.c to include though. Signed-off-by: Kyle McMartin commit d911aed8adf74e1fae88d082b8474b2175b7f1da Author: James Bottomley Date: Thu Nov 17 16:27:02 2005 -0500 [PARISC] Fix our interrupts not to use smp_call_function Fix our interrupts not to use smp_call_function On K and D class smp, the generic code calls this under an irq spinlock, which causes the WARN_ON() message in smp_call_function() (and is also illegal because it could deadlock). The fix is to use a new scheme based on the IPI_NOP. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 3f902886a81c6d4e6c399760936b645b5c7a7342 Author: Grant Grundler Date: Thu Nov 17 16:26:20 2005 -0500 [PARISC] Disable nesting of interrupts Disable nesting of interrupts - still has holes The offending sequence starts out like this: 1) take external interrupt 2) set_eiem() to only allow TIMER_IRQ; local interrupts still disabled 3) read the EIRR to get a "list" of pending interrupts 4) clear EIRR of pending interrupts we intend to handle 5) call __do_IRQ() to handle IRQ. 6) handle_IRQ_event() enables local interrupts (I-Bit) 7) take a timer interrupt 8) read EIRR to get a new list of pending interrupts 9) clear EIRR of pending interrupts we just read 10) handle pending interrupts found in (8) 11) set_eiem(cpu_eiem) and return [ TROUBLE! all enabled CPU IRQs are unmasked. } 12) handle remaining interrupts pending from (3) e.g. call __do_IRQ() -> handle_IRQ_event()..etc [ TROUBLE! call to handle_IRQ_event() can now enable *any* IRQ. } 13) set_eiem(cpu_eiem) and return The problem is we now get into ugly race conditions with Timer and IPI interrupts at this point. I'm not exactly sure what happens when things go wrong (perhaps nest calls to IPI or timer interrupt?). But I'm certain it's not good. This sequence will break sooner if (10) would accidentally leave interrupts enabled. I'm pretty sure the right answer is now to make cpu_eiem a per CPU variable since all external interrupts on parisc are per CPU. This means we will NOT need to send an IPI to every CPU in the system when enabling or disabling an IRQ since only one CPU needs to change it's EIEM. Thanks to James Bottomley for (once again) pointing out the problem. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 9a8b4584065dd241d6c2bf818e349986bd900b8e Author: James Bottomley Date: Thu Nov 17 16:24:52 2005 -0500 [PARISC] Make sure timer and IPI execute with interrupts disabled Fix a longstanding smp bug The problem is that both the timer and ipi interrupts are being called with interrupts enabled, which isn't what anyone is expecting. The IPI issue has just started to show up by causing a BUG_ON in the slab debugging code. The timer issue never shows up because there's an eiem work around in our irq.c The fix is to label both these as SA_INTERRUPT which causes the generic irq code not to enable interrupts. I also suspect the smp_call_function timeouts we're seeing might be connected with the fact that we disable IPIs when handling any other type of interrupt. I've put a WARN_ON in the code for executing smp_call_function() with IPIs disabled. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 6b1de9161e973bac8c4675db608fe4f38d2689bd Author: Jens Axboe Date: Thu Nov 17 21:35:02 2005 +0100 [PATCH] VM: fix zone list restart in page allocatate We must reassign z before looping through the zones kicking kswapd, since it will be NULL if we hit an OOM condition and jump back to the beginning again. 'z' is initially assigned before the restart: label. So move the restart label up a little. Signed-off-by: Jens Axboe commit bb833986674ce1fc1b237b3d81459511ad2df393 Author: Greg Kroah-Hartman Date: Thu Nov 17 09:48:18 2005 -0800 [PATCH] USB: add the anydata usb-serial driver Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2d117403ae4006eeeb9037b82e9ecd8b3b043584 Author: Greg Kroah-Hartman Date: Thu Nov 17 09:48:13 2005 -0800 [PATCH] USB: delete the nokia_dku2 driver It was causing too many problems, and this is not the proper type of driver for this device. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 654f31189e550cd5924b786487a5d93d9feaada9 Author: Greg Kroah-Hartman Date: Thu Nov 17 09:48:09 2005 -0800 [PATCH] USB: move CONFIG_USB_DEBUG checks into the Makefile This lets us remove a lot of code in the drivers that were all checking the same thing. It also found some bugs in a few of the drivers, which has been fixed up. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 87cf203935a646d5fb00464dc5887292da71d928 Author: Richard Purdie Date: Thu Nov 17 09:47:57 2005 -0800 [PATCH] USB: OHCI lh7a404 platform device conversion fixup Fix an error in the OHCI lh7a404 driver after the platform device conversion. Signed-off-by: Richard Purdie Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9465663965fbe7de4e21d090e8eb0cc34b65294f Author: Antti Andreimann Date: Thu Nov 17 09:47:53 2005 -0800 [PATCH] USB: Maxtor OneTouch button support for older drives This small patch adds a device ID used by older Maxtor OneTouch drives (the ones with blue face-plate instead of the fancy silver one used in newer models). The button on those drives works well with the current driver. From: Antti Andreimann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 058120d70ebb430e27ad55871429028361c5baed Author: Andrew Morton Date: Thu Nov 17 09:47:49 2005 -0800 [PATCH] usb devio warning fix drivers/usb/core/devio.c: In function `proc_ioctl_compat': drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d23b536bb715673ca0ccbdaac2b6ce2c001d06e9 Author: Herbert Xu Date: Thu Nov 17 09:47:45 2005 -0800 [PATCH] USB: fix race in kaweth disconnect this patch from Herbert Xu fixes a race by moving termination of the URBs into close() exclusively. Signed-off-by: Herbert Xu Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8845add380854ffce5268714a093df8c80b4a6e2 Author: Daniel Drake Date: Thu Nov 17 09:48:01 2005 -0800 [PATCH] usb-storage: Fix detection of kodak flash readers in shuttle_usbat driver Peter Favrholdt reported that his Kodak flash device was getting detected as a CDROM, and he helped me track this down to the fact that the device takes a long time (approx 440ms!) to reset. This patch increases the delay to 500ms, which solves the problem. Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9142d59a451731d23539d218c962418acc93283c Author: Oliver Neukum Date: Thu Nov 17 09:47:41 2005 -0800 [PATCH] USB: Adapt microtek driver to new scsi features the scsi layer now uses very short sg lists. This breaks the microtek driver. Here is a patch fixes this and some other issues. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b8f4c1d6674463e5824eada1ad7ec799276718bd Author: Luiz Fernando Capitulino Date: Thu Nov 17 09:47:36 2005 -0800 [PATCH] USB: pl2303: updates pl2303_update_line_status() Updates pl2303_update_line_status() to handle X75 and SX1 Siemens mobiles Signed-off-by: Luiz Capitulino Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a8310f3b8b713e52d77c56d4b8865685ee40d02a Author: Luiz Fernando Capitulino Date: Thu Nov 17 09:47:32 2005 -0800 [PATCH] USB: pl2303: adds new IDs. This patch adds two new Siemens mobiles IDs for the pl2303 driver. Signed-off-by: Luiz Capitulino Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c9d00fc148b210aa8cf388d6e1eac187a0e855a6 Author: David Brownell Date: Thu Nov 17 09:47:28 2005 -0800 [PATCH] USB: onetouch doesn't suspend yet The onetouch support doesn't suspend correctly (leaves an interrupt URB posted, instead of unlinking it) so for now just disable it when PM is in the air. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b0ce84d5539de88a1001f9aa3deeaa20fde3d152 Author: Josef Balatka Date: Thu Nov 17 09:47:24 2005 -0800 [PATCH] USB: cp2101.c: Jablotron usb serial interface identification Jablotron usb serial interface identification Signed-off-by: Josef Balatka Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c5dbf868e2bbeea6581f388a09539779c0d61357 Author: Pavel Machek Date: Thu Nov 17 09:47:11 2005 -0800 [PATCH] USB: kill unneccessary usb-storage blacklist entries I actually have this device, and kernel reports blacklist entry is no longer neccessary. Signed-off-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 777da5905e82695d1dd73eee6cfe50bd486d8fe9 Author: Andrew Morton Date: Thu Nov 17 09:47:02 2005 -0800 [PATCH] USB: usbdevfs_ioctl 32bit fix drivers/usb/core/devio.c: In function `proc_ioctl_compat': drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast NFI if this is correct... Cc: Pete Zaitcev Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit bc7cb323bab717660830211d50555dedf19e372e Author: OGAWA Hirofumi Date: Thu Nov 17 09:47:07 2005 -0800 [PATCH] usbfs: usbfs_dir_inode_operations cleanup Signed-off-by: OGAWA Hirofumi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c611d2cd2f74988baa9a4c6cfc8a48064fd075e6 Author: Marcel Holtmann Date: Thu Nov 17 09:46:39 2005 -0800 [PATCH] USB: Delete leftovers from bluetty driver This patch deletes the bluetooth.txt help file of the bluetty driver and hands over its major device nodes for character devices to the RFCOMM TTY implementation of the Bluetooth subsystem. Signed-off-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d4ece29d89d424ea045753c639971429faa9ee58 Author: Dmitry Torokhov Date: Thu Nov 17 09:46:44 2005 -0800 [PATCH] USB: fix 'unused variable' warning USB: fix 'unused variable' warning Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ebb6f371ac5ce623051c4431c5d0f093462f679b Author: Ping Cheng Date: Thu Nov 17 09:46:51 2005 -0800 [PATCH] USB: wacom tablet driver update This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. and report Device IDs. Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 116d75bd4d539309e0e1391e509f852a9cce82a6 Author: Ping Cheng Date: Thu Nov 17 09:46:33 2005 -0800 [PATCH] USB: add new wacom devices to usb hid-core list This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 80ed89f6105fd2f35b3b9ee2078f31e1510da71e Author: Greg Kroah-Hartman Date: Thu Nov 17 09:46:28 2005 -0800 [PATCH] USB Serial: rename ChangeLog.old People are complaining about a .old file in the tree. So rename drivers/usb/serial/ChangeLog.old to ChangeLog.history. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit cca2362c64429283d384df5b4cb948dcd6e8127b Author: Greg Kroah-Hartman Date: Thu Nov 17 09:46:24 2005 -0800 [PATCH] USB: fix build breakage in dummy_hcd.c Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 1a7ec1a6a1df63aab9a1fa6174bd704241329805 Author: Deepak Saxena Date: Thu Nov 17 11:09:53 2005 -0800 [PATCH] Fix IXP4xx I2C driver build breakage Platform device conversion missed a couple of spots. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit cd02e27b1514a27b2a8ab59755ae6d23d4d8a10f Author: Linus Torvalds Date: Thu Nov 17 10:04:31 2005 -0800 x86: Fix silly typo in recent fixes The second __const_sigaddset() should have been a sigdelset.. Compile trouble noted by Greg K-H. Signed-off-by: Linus Torvalds commit e8aabc47168d24eabc08418db4e034a4c625721c Author: Chen, Kenneth W Date: Thu Nov 17 01:55:34 2005 -0800 [IA64] polish comments for tlb fault handler in ivt.S Polish the comments specifically in vhpt_miss and nested_dtlb_miss handlers. I think it's better to explicitly name each page table level with its name instead of numerically name them. i.e., use pgd, pud, pmd, and pte instead of referring as L1, L2, L3 etc. Along the line, remove some magic number in the comments like: "PTA + (((IFA(61,63) << 7) | IFA(33,39))*8)". No code change at all, pure comment update. Feel free to shoot anything you have, darts or tomahawk cruise missile. I will duck behind a bunker ;-) Signed-off-by: Ken Chen Acked-by: Robin Holt Signed-off-by: Tony Luck commit fedb25fae72bc2c3709448a43be067439643da87 Author: Chen, Kenneth W Date: Thu Nov 17 01:38:42 2005 -0800 [IA64] 4 level page table bug fix in vhpt_miss From source code inspection, I think there is a bug with 4 level page table with vhpt_miss handler. In the code path of rechecking page table entry against previously read value after tlb insertion, *pte value in register r18 was overwritten with value newly read from pud pointer, render the check of new *pte against previous *pte completely wrong. Though the bug is none fatal and the penalty is to purge the entry and retry. For functional correctness, it should be fixed. The fix is to use a different register so new *pud don't trash *pte. (btw, the comments in the cmp statement is wrong as well, which I will address in the next patch). Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 67a1901ff498363e253b90ba132e336c925203ed Author: Russell King Date: Thu Nov 17 16:48:00 2005 +0000 [ARM] __ioremap doesn't use 4th argument The "align" argument in ARMs __ioremap is unused and provides a misleading expectation that it might do something. It doesn't. Remove it. Signed-off-by: Russell King commit 0c2e4b4ff38986e5b6f707d006799bff9663c802 Author: Russell King Date: Thu Nov 17 16:46:41 2005 +0000 [ARM] Drivers should not make use of architecture private __ioremap __ioremap is an architecture private interface and must not be used by drivers when the architecture independent interface will do just as well. Switch the ipaq drivers to use the correct interface. Signed-off-by: Russell King commit 728f5c076ad000e547aa9e00d16792043ee1bfc6 Author: Russell King Date: Thu Nov 17 16:43:14 2005 +0000 [ARM] Improve comment about ASSERT()s in vmlinux.lds.S Provide folk with an idea what to do if the ASSERT statements fail with their linker. Signed-off-by: Russell King commit b7fd1edd2c0c225afa96af92d4adecb91e7d439d Author: Constantine Gavrilov Date: Thu Nov 17 11:40:43 2005 +0200 [PATCH] x86: fix sigaddset() inline asm memory constraint Due to incomplete memory constraints, gcc would miscompile code with sigaddset on i386 if sig arg was const. A quote form Jakub to make the issue clear: "You need either __asm__("btsl %1,%0" : "+m"(*set) : "Ir"(_sig-1) : "cc"); or __asm__("btsl %1,%0" : "=m"(*set) : "Ir"(_sig-1), "m"(*set) : "cc"); because the btsl instruction doesn't just set the memory to some value, but needs to read its previous content as well. If you don't tell that fact to GCC, GCC is of course free to optimize as if the asm was just setting the value and not depended on the previous value." Signed-off-by: Linus Torvalds commit 3b26b1100e26811e54770abaa221eae140ba840d Author: Zhu Yi Date: Thu Nov 17 13:58:30 2005 +0800 [PATCH] ipw2200: fix error log offset calculation This fixes a slab corruption issue in the ipw2200 driver: it essentially multiplied the error log number _twice_ by the size of the error element entry (once explicitly in the code, and once implicitly as part of the regular pointer arithmetic). Cc: Henrik Brix Andersen Cc: Bernard Blackham Cc: Zilvinas Valinskas Cc: Pekka Enberg Signed-off-by: Zhu Yi Signed-off-by: Linus Torvalds -- commit efb3442cf1c65747a858476e10f705612383eed1 Author: Pekka Enberg Date: Wed Nov 16 21:55:05 2005 +0200 [PATCH] ipw2200: disallow direct scanning when device is down The function ipw_request_direct_scan() should bail out when the device is down. This fixes a lockup caused by wpa_supplicant triggering ipw_request_direct_scan() while the driver was in a middle of a reset due to firmware errors. Thanks to Zilvinas Valinskas for reporting the bug and helping me debug it. Signed-off-by: Pekka Enberg Acked-by: Zhu Yi Signed-off-by: Linus Torvalds commit aec8b7557cf0fc4dac059112328b5aa89271c77e Author: Ralf Baechle Date: Thu Nov 17 16:23:58 2005 +0000 [MIPS] Update defconfigs Signed-off-by: Ralf Baechle commit 1a6ea3ec6784cf3dedc338e1980dc0b4cf28a805 Author: Ralf Baechle Date: Tue Nov 15 16:10:01 2005 +0000 [MIPS] SEAD: More build fixes. Signed-off-by: Ralf Baechle commit 09b696efd93560609f25821208dae18027187425 Author: Ralf Baechle Date: Tue Nov 15 13:55:06 2005 +0000 [MIPS] TX3927: Try to glue the PCI code. Signed-off-by: Ralf Baechle commit 561a0792405bea8ead78990d755dd1f95b8e95b8 Author: Ralf Baechle Date: Tue Nov 15 13:25:59 2005 +0000 [MIPS] SEAD: Delete seadint_init() prototype. There is no definition for seadint_init() and the unprotected prototype breaks compilation of assembler files. Signed-off-by: Ralf Baechle commit 3d5d44017601c927f5e14c43b0efee34e7e50a66 Author: Ralf Baechle Date: Tue Nov 15 13:11:35 2005 +0000 [MIPS] Ocelot G: Use CPU_MASK_NONE instead of 0 to initialize cpu mask. Signed-off-by: Ralf Baechle commit c183f1224bbae052b5fbb971d6eafc5cbdc6be4f Author: Ralf Baechle Date: Tue Nov 15 13:05:26 2005 +0000 [MIPS] JMR3927: Fix include wrapper symbol. Signed-off-by: Ralf Baechle commit c32cf78c0289c4d8f5973c985dda18f2b3a03e2b Author: Ralf Baechle Date: Tue Nov 15 13:01:50 2005 +0000 [MIPS] JMR3927: Fix compilation by including . Signed-off-by: Ralf Baechle commit 5135b0cdb23e47dd48d8100e45bd48ce937732ff Author: Ralf Baechle Date: Tue Nov 15 12:19:46 2005 +0000 [MIPS] JMR3927: need include/asm-mips/mach-jmr3927 in it's include path. Signed-off-by: Ralf Baechle commit 8bf4057bdd8912c7388c28e625f0b846a4ca1468 Author: Ralf Baechle Date: Tue Nov 15 12:17:42 2005 +0000 [MIPS] JMR3927: It's ops-tx3927.o not ops-jmr3927.o Signed-off-by: Ralf Baechle commit 4237f229018ccf937578dee97565a49d712809e8 Author: Ralf Baechle Date: Thu Nov 17 16:23:50 2005 +0000 [IDE] Add driver for Sibyte Swarm evaluation board This driver supports the IDE port on the Sibyte Swarm evaluation boards and it's relatives for the BCM1250 family of systems on a chip. Signed-off-by: Ralf Baechle Acked-by: Bartlomiej Zolnierkiewicz commit b60ccd575c2d96041b856aad19a7d3af168d79b9 Author: Pantelis Antoniou Date: Sun Nov 13 23:27:46 2005 +0200 [MIPS] Alchemy: Console output fixup This is needed to make console output appear with the new driver... Signed-off-by: Ralf Baechle commit f10d14ddec8daf11a298f05ab3d644887df39830 Author: Arnaud Giersch Date: Sun Nov 13 00:38:18 2005 +0100 [MIPS] Fix documentation typos. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 99289a4e8a9cb3fa6caa8fc4ebf57a33db497340 Author: Arnaud Giersch Date: Sun Nov 13 00:38:18 2005 +0100 [MIPS] Add const qualifier to writes##bwlq. Add const qualifier to parameter addr of writes##bwlq. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 59f145d28ce853b13dafdfab438c48f3ead0b38e Author: Arnaud Giersch Date: Sun Nov 13 00:38:18 2005 +0100 [MIPS] IP32: Fix sparse warnings. Add __iomem qualifier to crime and mace pointers. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 84c493d8e143360cfba3efede97e5a93d62c4d3d Author: Arnaud Giersch Date: Sun Nov 13 00:38:18 2005 +0100 [MIPS] IP32 Fix and complete IP32 parport definitions Fix, complete, and indent IP32 parport definitions. Definition were wrong for CTXINUSE and DMACTIVE (1-bit shift). Add macros DATA_BOUND, DATALEN_SHIFT, and CTRSHIFT. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 19ce1cfb2d53e5b9f70d0199d551789db2718e6f Author: Arnaud Giersch Date: Sun Nov 13 00:38:18 2005 +0100 [MIPS] IP32: Export mace symbol. Export mace symbol so that it can be used in modules. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 70ad7d1840d3479ea8503c9f89ec503115bfd2cf Author: Ralf Baechle Date: Fri Nov 11 11:49:53 2005 +0000 [MIPS] JMR3927: Fix syntax error. Signed-off-by: Ralf Baechle commit efd9412d850397fc129c17eb33c84f74abb0d3ee Author: Ralf Baechle Date: Fri Nov 11 11:46:25 2005 +0000 [MIPS] JMR3927: Undo accidental rename. Signed-off-by: Ralf Baechle commit d93efab838ee399b45379bd97b2812ecee84471b Author: Ralf Baechle Date: Fri Nov 11 11:15:41 2005 +0000 [MIPS] DDB5477: Fix unused variable warning. Signed-off-by: Ralf Baechle commit 16212017a54afdb702ecc796aaa0448b795de03b Author: Ralf Baechle Date: Thu Nov 17 16:23:44 2005 +0000 [MIPS] IP32: No need to include . Signed-off-by: Ralf Baechle commit cd017fbdd33f2d8294b0e0324faa1dc7750b4af0 Author: Ralf Baechle Date: Thu Nov 17 16:23:43 2005 +0000 Add definitions for the Dallas DS1742 RTC / non-volatile memory. Signed-off-by: Ralf Baechle commit 443bf3292f04c53e92bf0588f1aa2c9b421545e2 Author: Ralf Baechle Date: Thu Nov 17 16:23:42 2005 +0000 Add definitions for the Dallas DS17287 RTC. Signed-off-by: Ralf Baechle commit bdc3c3c7cbc3e1244c03640b4b372d097a1dacf3 Author: Ralf Baechle Date: Thu Nov 17 16:23:42 2005 +0000 [MIPS] Add missing arch defines for the Alchemy MTD driver. Signed-off-by: Ralf Baechle commit 6f17ce33fef3fd84e3e45850c9388d118adfad96 Author: Yoichi Yuasa Date: Thu Nov 10 22:42:36 2005 +0900 Add GT64111 PCI ID back Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 0905780aae58ea69f2dafea9716ee2ea78dbe4e2 Author: Maciej W. Rozycki Date: Mon Jun 13 19:58:50 2005 +0000 [MIPS] zs.c: Resurrect the deceased zs.c for now. Not that it's meant to be sustained for long, but from time to time it's useful to have some console... Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit e0c9b7973021ea4baa1ed76ff25ceb80f75edd8f Author: Ralf Baechle Date: Tue Nov 8 22:36:48 2005 +0000 [MIPS] feature-removal-schedule.txt: Schedule au1x00_uart for removal. The 8250 serial driver now has the ability to deal with the differences between the standard 8250 family of UARTs and their slightly strange brother on Alchemy SOCs. The loss of features is not considered an issue. Signed-off-by: Ralf Baechle commit db7f6861822c80f17a23647b4d0042dcc56e2024 Author: Ralf Baechle Date: Tue Nov 8 22:23:13 2005 +0000 [MIPS] Delete duplicate definitions of break codes. Signed-off-by: Ralf Baechle commit 20913a9f6e3ae9a7facf96c7b1299e3875a895a0 Author: Andrey Volkov Date: Thu Nov 17 16:05:35 2005 +0000 [DRIVER MODEL] Fix typo in ohci-ppc-soc.c Fix copy-paste bug in ohci-ppc-soc.c(ohci_hcd_ppc_soc_drv_remove) Signed-off-by: Andrey Volkov Signed-off-by: Russell King commit 7d78c887a94067ba218dc71b89d0d7a09415197f Author: Russell King Date: Thu Nov 17 15:47:30 2005 +0000 [DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms Signed-off-by: Russell King commit a2c91a8819e315e9fd1aef3ff57badb6c1be3f80 Author: Jeff Garzik Date: Thu Nov 17 05:44:44 2005 -0500 [libata sata_mv] handle lack of hardware nIEN support Handle errata (it was unintentional on this h/w, whereas its intentional on others) whereby the nIEN bit in Device Control is ignored, leading to a situation where a hardware interrupt completes the qc before the polling code has a chance to. This will get fixed The Right Way(tm) once Albert Lee's irq-pio branch is merged, as the more natural PIO method on this hardware is interrupt-driven. commit 22374677d18c5eeefd3a283431d312b8c44fef02 Author: Jeff Garzik Date: Thu Nov 17 10:59:48 2005 -0500 [libata sata_mv] SATA probe, DMA boundary fixes - DMA boundary was being handled incorrectly. Copied the code from ata_fill_sg(), since Marvell has the same DMA boundary needs. (we can't use ata_fill_sg directly since we have different hardware descriptors) - cleaned up the SATA phy reset code, to deal with various errata commit 64f043d80752a8e5f0d55255e7bb9a1a05af206f Author: Jeff Garzik Date: Thu Nov 17 10:50:01 2005 -0500 [libata] add timeout to commands for which we call wait_completion() commit 4a59a810513d5f7aa76515908b8e3620fa1b9b69 Author: Patrick McHardy Date: Wed Nov 16 23:14:19 2005 -0800 [NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG CC [M] net/netfilter/nf_conntrack_core.o net/netfilter/nf_conntrack_core.c: In function 'nf_ct_unlink_expect': net/netfilter/nf_conntrack_core.c:390: error: 'exp_timeout' undeclared (first use in this function) net/netfilter/nf_conntrack_core.c:390: error: (Each undeclared identifier is reported only once net/netfilter/nf_conntrack_core.c:390: error: for each function it appears in.) Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit b341e32e5cc1a154cb0ac2f4229c2d040647804b Author: Benjamin Herrenschmidt Date: Thu Nov 17 13:34:57 2005 +1100 [PATCH] powerpc: Workaround for offb on 64 bits platforms This fixes a problem with offb not parsing addresses properly on 64 bits machines, and thus crashing at boot. The problem is worked around by locating the matching PCI device and using the properly relocated PCI base addresses instead of misparsing the Open Firmware properties. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 1e28a7ddd3e713384e9c6768e7c502031dc205e2 Author: David Woodhouse Date: Thu Nov 17 00:44:03 2005 +0000 [PATCH] Avoid use of uninitialised spinlock in EEH. If the kernel supports both G5 and pSeries, and CONFIG_EEH is enabled, eeh_init() is (quite reasonably) never called when we boot on a G5. Yet eeh_check_failure() still gets called. We should avoid doing that if !eeh_subsystem_enabled. Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras commit 5cfccd7f132432dd4705444a44b51d12ef88a85f Author: Nick Piggin Date: Wed Nov 16 23:37:53 2005 +1100 [PATCH] powerpc: Fix database regression due to scheduler changes PowerPC's NUMA domain doesn't currently set up some of the newer sched-domains parameters. Brian Twichell discovered and diagnosed a 1.5% OLTP database regression on a 4 core POWER5 system that was due to the use of NUMA scheduling on ppc64. This patch applies some saneish values to the parameters, in line with other architectures. This solves the regression. Signed-off-by: Nick Piggin Signed-off-by: Paul Mackerras commit e53091fae52931a96dfb661f2b78e0a91e5f9978 Author: Francois Romieu Date: Wed Nov 16 23:44:41 2005 +0100 r8169: do not abort when the power management capabilities are disabled The capabilities of the 8169 can be disabled but it is hardly a reason to prevent the use the device. The (so far) unusual behavior has been reported on a MIPS platform by Yoichi Yuasa. Spotted-by: Yoichi Yuasa Signed-off-by: Francois Romieu commit 7c8b2eb4c71d5c3d45dbfe0c81fefe81e264e9b3 Author: Francois Romieu Date: Wed Nov 16 23:44:05 2005 +0100 r8169: fix printk_ratelimit in the interrupt handler I keep on getting "printk: N messages suppressed" messages. We need to test netif_msg_intr() _before_ running printk_ratelimit(), because the latter updates state. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Francois Romieu commit e7c8a41e817f381ac5c2a59ecc81b483bd68a7df Author: Yasuyuki Kozakai Date: Wed Nov 16 12:55:37 2005 -0800 [IPV4,IPV6]: replace handmade list with hlist in IPv{4,6} reassembly Both of ipq and frag_queue have *next and **prev, and they can be replaced with hlist. Thanks Arnaldo Carvalho de Melo for the suggestion. Signed-off-by: Yasuyuki Kozakai Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 1f7bad72c0ed8cf29d13bac81ceeba9e1ac05c66 Author: Krzysztof Halasa Date: Fri Nov 11 01:10:30 2005 +0100 [PATCH] Generic HDLC WAN drivers - disable netif_carrier_off() As we are currently unable to fix the problem with carrier and protocol state signaling in net core I've to disable netif_carrier_off() calls used by WAN protocol drivers. The attached patch should make them working again. The remaining netif_carrier_*() calls in hdlc_fr.c are fine as they don't touch the physical device. Signed-off-by: Krzysztof Halasa Signed-off-by: John W. Linville commit 5470dc656820fb67c0a2e352f0aaa48b86c19026 Author: Russell King Date: Wed Nov 16 18:36:49 2005 +0000 [ARM] No need to include asm/proc-fns.h into asm/system.h In the old days when arm26/arm32 was combined into the same architecture, proc-fns.h provided the xchg implementation for arm26 CPUs. Since we no longer combine these two, this include is no longer required. Remove it. Signed-off-by: Russell King commit 45e109d07275e0820745dc465302de0aa5a8703b Author: Russell King Date: Wed Nov 16 18:29:51 2005 +0000 [ARM] sa1111.c needs asm/sizes.h Signed-off-by: Russell King commit 49ee57a3295a227b6a02785f75ccd521e493e983 Author: Russell King Date: Wed Nov 16 18:03:10 2005 +0000 [ARM] Use unsigned long not u32 in atomic_cmpxchg Since atomic.h does not include types.h, u32 may not be defined. Since atomics are supposed to work on unsigned long quantities, use unsigned long instead. Signed-off-by: Russell King commit 1b12050f17460dc312cfd8cc59c79e181b23062b Author: Russell King Date: Wed Nov 16 17:38:40 2005 +0000 [ARM] Move zone adjustment for SA1111 on SA11x0 platforms Unfortunately, using PAGE_SHIFT in asm/arch/memory.h is unsafe, and we can't include asm/page.h into this file because then we have a circular dependency. Move the offending code to arch/arm/common/sa1111.c instead. Signed-off-by: Russell King commit 8dc39b883e9497445b53c498be7493c3e43af006 Author: Russell King Date: Wed Nov 16 17:23:57 2005 +0000 [ARM] Add linux/compiler.h includes where required atomic.h, bitops.h and mmu_context.h are using likely/unlikely. thread_info.h uses __attribute_const__. Hence these files require linux/compiler.h to be included. Signed-off-by: Russell King commit 7bdd720869ff75700b48b132ee71852615b55808 Author: Jeff Garzik Date: Wed Nov 16 11:06:59 2005 -0500 [libata] bump versions commit 994e12805336f899d0ec1cf38a99c7b6405d144a Author: Ben Dooks Date: Wed Nov 16 15:05:13 2005 +0000 [ARM] 3162/1: S3C2410 - updated defconfig Patch from Ben Dooks Minor changes, including add SysRq, selecting the DM9000 as a built-in driver, not as a module, and selecting the framebuffer. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b526bf23fd4138456b1bb4f1305862695604c798 Author: Ben Dooks Date: Wed Nov 16 15:05:12 2005 +0000 [ARM] 3161/1: BAST - fix commas on end of structs Patch from Ben Dooks Make the use of , on the lsat entry structs consistenent through arch/arm/mach-s3c2410/mach-bast.c Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a7d068336197945dc4af65c5973c996e526d51cb Author: Nicolas Pitre Date: Wed Nov 16 15:05:11 2005 +0000 [ARM] 3165/1: fix atomic_cmpxchg() implementation for ARMv6+ Patch from Nicolas Pitre If 'old' and 'oldval' are different then 'res' never gets set. In that case, if ever %0 happened to contain anything but zero (rather likely) then the code will loop forever (or until another CPU just come along and change the atomic value to match 'old' which is rather unlikely). Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 224b5be6ddc12fa7587433878866cd39e7b935f5 Author: Russell King Date: Wed Nov 16 14:59:51 2005 +0000 [ARM] compressed/head.S debugging defaults to asm/arch/debug-macro.S Since we want new platforms to use debug-macro.S, make the decompressor debugging method default to using this include file rather than having new platforms add to an #if defined(). Signed-off-by: Russell King commit 0a5709b2dc84140082ea235130a05c05d51f94a2 Author: Russell King Date: Wed Nov 16 14:51:20 2005 +0000 [ARM] Include asm/hardware.h instead of asm/arch/hardware.h Rationalise hardware.h include. Signed-off-by: Russell King commit ce07d90aa80a4c9a956eb2f662e4be5ea5c6baf8 Author: Russell King Date: Wed Nov 16 14:38:19 2005 +0000 [ARM] Fix arch-realview/system.h to use __io_address() Move __io_address to arch-realview/hardware.h, drop core.h from platsmp.c and localtimer.c, and include asm/io.h where required. Signed-off-by: Russell King commit c2cd76ff106b8bd9c0a754c6439c74e86fd2aba7 Author: Jeff Garzik Date: Wed Nov 16 09:23:30 2005 -0500 [libata ahci] tone down ATAPI errors ATA devices don't generate many errors, so the preferred method is to printk() when they occur. ATAPI devices generate tons of exceptions during the normal course of operation, so this change skips logging the most common class of errors. commit 75b1f2f865c6e6c6c04e2779750192b8d3d504e8 Author: Albert Lee Date: Wed Nov 16 17:06:18 2005 +0800 [PATCH] libata: honor the transfer cycle time speficied by the EIDE device The following code segment is not functional because the transfer cycle time speficied by the EIDE device is later overwritten by ata_timing_quantize(): /* * If the drive is an EIDE drive, it can tell us it needs extended * PIO/MW_DMA cycle timing. */ if (adev->id[ATA_ID_FIELD_VALID] & 2) { /* EIDE drive */ memset(&p, 0, sizeof(p)); (snip) ata_timing_merge(&p, t, t, ATA_TIMING_CYCLE | ATA_TIMING_CYC8B); <== uninitialized "t" is used here } /* * Convert the timing to bus clock counts. */ ata_timing_quantize(s, t, T, UT); <== t is overwritten by quantized s The patch has been submitted for ide-timing.h before: http://marc.theaimsgroup.com/?l=linux-ide&m=110820013425454&w=2 Resubmitted for libata. Changes: - Minor fix to honor the following transfer cycle time speficied by the device - id[65]: Minimum Multiword DMA transfer cycle time per word - id[67]: Minimum PIO transfer cycle time without flow control - id[68]: Minimum PIO transfer cycle time with IORDY Signed-off-by: Albert Lee ======= Signed-off-by: Jeff Garzik commit d10cb35a876c72b4b6711a366e341a1e4d8aa709 Author: Tejun Heo Date: Wed Nov 16 16:56:49 2005 +0900 [PATCH] sil24: add constants Adds constants for ATAPI support to sata_sil24. This patch is originally from Jeff Garzik . Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6e87abd0b8cbb23ed9ffe5cc9f790fb5cac45eae Author: David S. Miller Date: Wed Nov 16 00:52:57 2005 -0800 [DVB]: Add compat ioctl handling. Based upon a patch by Guido Guenther . Some of these ioctls had embedded time_t objects or pointers, so needed translation. Signed-off-by: David S. Miller commit 7b5603e056b8b5f3175f14badd895b9ac567f315 Author: David S. Miller Date: Wed Nov 16 00:11:50 2005 -0800 [DVB] cinergyT2: cinergyt2_register_rc() should return 0 on success Currently, the version when ENABLE_RC is defined, falls through to the end of the function without returning anything. Signed-off-by: David S. Miller commit 574780d56fdafe2c8ea98660a932760dfea9bffc Author: Guido Guenther Date: Wed Nov 16 00:08:44 2005 -0800 [SPARC64]: Oops in pci_alloc_consistent with cingergyT2 From: Guido Guenther - Use correct API for allocating and freeing DMA buffers. Acked-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 5d66da3d71e6aeca80ca08dbebd8a1cd72e6ee1f Author: Benjamin Herrenschmidt Date: Wed Nov 16 13:54:32 2005 +1100 [PATCH] powerpc: Make the vDSO functions set error code (#2) The vDSO functions should have the same calling convention as a syscall. Unfortunately, they currently don't set the cr0.so bit which is used to indicate an error. This patch makes them clear this bit unconditionally since all functions currently succeed. The syscall fallback done by some of them will eventually override this if the syscall fails. This also changes the symbol version of all vdso exports to make sure glibc can differenciate between old and fixed calls for existing ones like __kernel_gettimeofday. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit d3ed65832029dcaf5fe086670a2f2c25600b51e9 Author: Benjamin Herrenschmidt Date: Wed Nov 16 13:40:43 2005 +1100 [PATCH] ppc: Fix build with CONFIG_CHRP not set Building ARCH=ppc for multiplatforms with CONFIG_CHRP not set fails due to some unshielded code in xmon Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 94b212c29f685ca54b5689a8e89ac7671c43d651 Author: Paul Mackerras Date: Wed Nov 16 13:38:21 2005 +1100 powerpc: Move ppc64 boot wrapper code over to arch/powerpc This also extends the code to handle 32-bit ELF vmlinux files as well as 64-bit ones. This is sufficient for booting on new-world 32-bit powermacs (i.e. all recent machines). Signed-off-by: Paul Mackerras commit 7486a38f683d49e6f8b2b9050ff06778b151a40c Author: Kumar Gala Date: Tue Nov 15 11:03:24 2005 -0600 [PATCH] powerpc: replace page_to_virt() with lowmem_page_address() for Book-E page_to_virt and lowmem_page_address provided equiavlent functionality so use the more standard lowmem_page_address This also addresses build issue in ARCH=powerpc since page_to_virt() has been removed from include/asm-powerpc/page.h Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 950fc0025f8566d1c44da04fed216513f83268af Author: Olof Johansson Date: Tue Nov 15 09:05:14 2005 -0800 [PATCH] powerpc: add new powerbooks to feature table Hi, The previous PowerBook patch didn't contain the feature table updates for ARCH=powerpc. Here they are. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit de93f0d62ccaa730fd46de14d46c0317bd82596a Author: Benjamin Herrenschmidt Date: Tue Nov 15 18:21:45 2005 +1100 [PATCH] ppc: Fix boot with yaboot with ARCH=ppc The merge of machine types broke boot with yaboot & ARCH=ppc due to the old code still retreiving the old-syle machine type passed in by yaboot. This patch fixes it by translating those old numbers. Since that whole mecanism is deprecated, this is a temporary fix until ARCH=ppc uses the new prom_init that the merged architecture now uses for both ppc32 and ppc64 (after 2.6.15) Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c0ce5c5228dd17d4e3dd1d15b8d52714262cab70 Author: Guido Guenther Date: Tue Nov 15 17:28:05 2005 +1100 [PATCH] PowerBook 6,1: headphone not detected after suspend ever since suspend to disk works I had the problem that headphone (un)plugging doesn't get detected properly anymore after the first resume. Reloading the module worked around this ever since, however the real cause of the problem was that after a resume the driver only got interrupts on "unplug" not on "plug". Reactivating the headphone status interrupt in tumbler_resume fixes this. This shouldn't cause any trouble with software suspend, but it would be nice if somebody could confirm this: Signed-off-by: Guido Guenther Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit b5166cc252190be80465f3b4f050e4a0310f71af Author: Benjamin Herrenschmidt Date: Tue Nov 15 16:05:33 2005 +1100 [PATCH] powerpc: pci_64 fixes & cleanups I discovered that in some cases (PowerMac for example) we wouldn't properly map the PCI IO space on recent kernels. In addition, the code for initializing PCI host bridges was scattered all over the place with some duplication between platforms. This patch fixes the problem and does a small cleanup by creating a pcibios_alloc_controller() in pci_64.c that is similar to the one in pci_32.c (just takes an additional device node argument) that takes care of all the grunt allocation and initialisation work. It should work for both boot time and dynamically allocated PHBs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit f9e4ec57c66586d0c165ed9373efaf9e329d5766 Author: Michael Ellerman Date: Tue Nov 15 15:16:38 2005 +1100 [PATCH] powerpc: More debugging fixups Add a few more missing includes of udbg.h Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit eb481899aa319cf5cbeccfd9deac907300698b57 Author: Michael Ellerman Date: Tue Nov 15 14:49:22 2005 +1100 [PATCH] powerpc: Fixup debugging in lmb.c Somewhere we lost the include of udbg.h in lmb.c. While we're there, add a DBG macro like every other file has and use it in lmb_dump_all(). Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 5444a5e9e872f599ec12534bd1bf9bc79a1c72ca Author: Benjamin Herrenschmidt Date: Tue Nov 15 14:40:25 2005 +1100 [PATCH] powerpc: update defconfigs My patch moving ppc64 RTC to genrtc was supposed to update all defconfigs, but for some reason, the patch actually posted only had the pseries one... ouch. This patch properly updates all defconfigs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit eb07d964b4491d1bb5864cd3d7e7633ccdda9a53 Author: Marcelo Tosatti Date: Mon Nov 14 05:38:31 2005 -0200 [PATCH] ppc32 8xx: update_mmu_cache() needs unconditional tlbie Currently 8xx fails to boot due to endless pagefaults. Seems the bug is exposed by the change which avoids flushing the TLB when not necessary (in case the pte has not changed), introduced recently: __handle_mm_fault(): entry = pte_mkyoung(entry); if (!pte_same(old_entry, entry)) { ptep_set_access_flags(vma, address, pte, entry, write_access); update_mmu_cache(vma, address, entry); lazy_mmu_prot_update(entry); } else { /* * This is needed only for protection faults but the arch code * is not yet telling us if this is a protection fault or not. * This still avoids useless tlb flushes for .text page faults * with threads. */ if (write_access) flush_tlb_page(vma, address); } The "update_mmu_cache()" call was unconditional before, which caused the TLB to be flushed by: if (pfn_valid(pfn)) { struct page *page = pfn_to_page(pfn); if (!PageReserved(page) && !test_bit(PG_arch_1, &page->flags)) { if (vma->vm_mm == current->active_mm) { #ifdef CONFIG_8xx /* On 8xx, cache control instructions (particularly * "dcbst" from flush_dcache_icache) fault as write * operation if there is an unpopulated TLB entry * for the address in question. To workaround that, * we invalidate the TLB here, thus avoiding dcbst * misbehaviour. */ _tlbie(address); #endif __flush_dcache_icache((void *) address); } else flush_dcache_icache_page(page); set_bit(PG_arch_1, &page->flags); } Which worked to due to pure luck: PG_arch_1 was always unset before, but now it isnt. The root of the problem are the changes against the 8xx TLB handlers introduced during v2.6. What happens is the TLBMiss handlers load the zeroed pte into the TLB, causing the TLBError handler to be invoked (thats two TLB faults per pagefault), which then jumps to the generic MM code to setup the pte. The bug is that the zeroed TLB is not invalidated (the same reason for the "dcbst" misbehaviour), resulting in infinite TLBError faults. The "two exception" approach requires a TLB flush (to nuke the zeroed TLB) at each PTE update for correct behaviour: Signed-off-by: Marcelo Tosatti Signed-off-by: Paul Mackerras commit fb6d73d3014babb69f5cc2d1d78b31e9d09fc5df Author: Paul Mackerras Date: Wed Nov 16 11:43:26 2005 +1100 [PATCH] powerpc: Fix sparsemem with memory holes [was Re: ppc64 oops..] This patch should fix the crashes we have been seeing on 64-bit powerpc systems with a memory hole when sparsemem is enabled. I'd appreciate it if people who know more about NUMA and sparsemem than me could look over it. There were two bugs. The first was that if NUMA was enabled but there was no NUMA information for the machine, the setup_nonnuma() function was adding a single region, assuming memory was contiguous. The second was that the loops in mem_init() and show_mem() assumed that all pages within the span of a pgdat were valid (had a valid struct page). I also fixed the incorrect setting of num_physpages that Mike Kravetz pointed out. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 5a6f294e43e432bd207a702fea49ebb303ef9b23 Author: KOVACS Krisztian Date: Tue Nov 15 16:47:34 2005 -0800 [NETFILTER] Free layer-3 specific protocol tables at cleanup Although the comment around the allocation code tells us that the layer-3 specific protocol tables will be freed when cleaning up, they aren't. And this makes nfsim complain loudly... Signed-off-by: KOVACS Krisztian Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 96479376c89e5be92c85bd350e3e2e8f0e7e3b52 Author: KOVACS Krisztian Date: Tue Nov 15 16:47:09 2005 -0800 [NETFILTER] Remove nf_conntrack stat proc file when cleaning up Fix nf_conntrack statistics proc file removal. Looks like the old bug was forward-ported from ip_conntrack. :-] Signed-off-by: KOVACS Krisztian Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 1e185b97b4364063f1135604b87f8d8469944233 Author: Chen, Kenneth W Date: Tue Nov 15 14:37:05 2005 -0800 [PATCH] ia64: cpu_idle performance bug fix Our performance validation on 2.6.15-rc1 caught a disastrous performance regression on ia64 with netperf (-98%) and volanomark (-58%) compares to previous kernel version 2.6.14-git7. See the following chart (result group 1 & 2). http://kernel-perf.sourceforge.net/results.machine_id=26.html We have root caused it to commit 64c7c8f88559624abdbe12b5da6502e8879f8d28 This changeset broke the ia64 task resched notification. In sched.c:resched_task(), a reschedule IPI is conditioned upon TIF_POLLING_NRFLAG. However, the above changeset unconditionally set the polling thread flag for idle tasks regardless whether pal_halt_light is in use or not. As a result, resched IPI is not sent from resched_task(). And since the default behavior on ia64 is to use pal_halt_light, we end up delaying the rescheduling task until next timer tick, and thus cause the performance regression. This fixes the performance bug. I'm glad our performance suite is turning up bad performance bug like this in time. Signed-off-by: Ken Chen Signed-off-by: Linus Torvalds commit 31f3426904e066f17e3f88c468a2f7c869ad4aac Author: Stephen Hemminger Date: Tue Nov 15 15:17:10 2005 -0800 [TCP]: More spelling fixes. From Joe Perches Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 72724382d3c9caab1d85e54080d338b854f10dd3 Author: Russell King Date: Tue Nov 15 19:04:22 2005 +0000 [ARM] Initialise SA1111 core before SA1111 PCMCIA This avoids a BUG_ON with kref.c when SA1111 tries to register a driver with an unregistered bus type. Signed-off-by: Russell King commit 9f68a24853dd37d18f2cfa979cf4e131f5a10e8f Author: Jeff Garzik Date: Tue Nov 15 14:03:47 2005 -0500 [libata ahci] command completion fixes, improved debug msgs - Fix a regression in command completion, which prevented the restart of the DMA engine after the device throws an error. - Pack more hardware info into the port-reset error message. - Promote "welcome to our timeout" message from debug msg to normal printk. commit e1f1def6ef3f0c71d0df302c3759f6937adaf9ae Author: Dave Jones Date: Tue Nov 15 00:09:24 2005 -0800 [PATCH] oops-tracing: mention extended VGA Something I've found handy countless times when users do this.. Signed-off-by: Dave Jones Acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d193f4f112b9d8855ba1339fa784ee95f25b9c7 Author: Ben Collins Date: Tue Nov 15 00:09:21 2005 -0800 [PATCH] Update location of ll_rw_blk.c in docs Picked from the ubuntu-2.6 tree The change in location for ll_rw_blk.c from drivers/block/ to block/ caused failure to generate documentation. Signed-off-by: Ben Collins Cc: Jeff Garzik Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 400bb2369df481abae5aa801e63e70008e15fba5 Author: Grant Coady Date: Tue Nov 15 00:09:20 2005 -0800 [PATCH] cciss_scsi warning fix drivers/block/cciss_scsi.c:264: warning: `print_bytes' defined but not used drivers/block/cciss_scsi.c:298: warning: `print_cmd' defined but not used Signed-off-by: Grant Coady Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c53508980a95b84c296c4336a831776cc22cf58 Author: Christoph Hellwig Date: Tue Nov 15 00:09:18 2005 -0800 [PATCH] v850: use generic hardirq code Signed-off-by: Christoph Hellwig Acked-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4eeb0a20f017fd8bc849cc50469c2e2e6a0c05c Author: Miles Bader Date: Tue Nov 15 00:09:17 2005 -0800 [PATCH] v850: Add missing include in hardirq.h Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 228322f13fe20bd29e81fca8341cc1fc7ffc5929 Author: Miles Bader Date: Tue Nov 15 00:09:16 2005 -0800 [PATCH] v850: Fix show_interrupts A variable was being used in multiple conflicting ways. I also restructured the code a bit for clarity. Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09071e35f9f0b308c37c9853766de573591589ea Author: Toni Mueller Date: Tue Nov 15 00:09:14 2005 -0800 [PATCH] sdladrv.c build fix gcc4 doesn't allow typecasted lvals. Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6a1a64aec2b2e2e13b629ed72afd319d8bce5da Author: Andrew Morton Date: Tue Nov 15 00:09:13 2005 -0800 [PATCH] hfc_usb: fix usb device table We need to use the USB_DEVICE macro here, else the modinfo aliases go all wrong. Also, correctly terminate the table, as noted by Dave Jones Cc: Greg KH Signed-off-by: Andrew Morton Acked-by: Karsten Keil Signed-off-by: Linus Torvalds commit 93588e2284b6be1873cc0bb7fbf0947bdbf72830 Author: NeilBrown Date: Tue Nov 15 00:09:12 2005 -0800 [PATCH] md: make md threads interruptible again Despite the fact that md threads don't need to be signalled, and won't respond to signals anyway, we need to have an 'interruptible' wait, else they stay in 'D' state and add to the load average. (akpm: the signal_pending() test is unneeded - we'll fix that up in the next round. For now, leave it there because that's how the code used to be). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8a0033451f7972169b2f375be34d9d805ad8687 Author: NeilBrown Date: Tue Nov 15 00:09:11 2005 -0800 [PATCH] md: mark START_ARRAY deprecated with a date This was marked deprecated "after 2.6" back in the 2.5 days. But now it seems there isn't going to be any "after 2.6", and we deprecate by date now. So set a date. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1887b93529410633b5529a7c2d304897dbed5b3e Author: NeilBrown Date: Tue Nov 15 00:09:10 2005 -0800 [PATCH] knfsd: make sure nfsd doesn't hog a cpu forever Being kernel-threads, nfsd servers don't get pre-empted (depending on CONFIG). If there is a steady stream of NFS requests that can be served from cache, an nfsd thread may hold on to a cpu indefinitely, which isn't very friendly. So it is good to have a cond_resched in there (just before looking for a new request to serve), to make sure we play nice. Signed-off-by: Neil Brown Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa63b229829e73361900183bc1ae21b71b6c2dae Author: Ben Collins Date: Tue Nov 15 00:09:09 2005 -0800 [PATCH] Add missing EXPORT_SYMBOLS() for __ide_mm_* functions on powerpc These exported symbols are in arch/ppc/ but missing from arch/powerpc/ for ppc32 builds. Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3225e1d3d1ebc3fcb74fbbb166520f35c35a22f4 Author: Corey Minyard Date: Tue Nov 15 00:09:07 2005 -0800 [PATCH] ipmi: bump-driver-version Lots of good changes to the driver lately that userspace will care about the version of the driver. Bump the version from 36.0 to 38.0 to be higher than 37 that the 2.4 driver came out with a few weeks ago which doesn't have all the same changes. Signed-off-by: Matt Domsch Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4ed803c564701eae9534ab26a86ddb06acaf49c Author: Harald Welte Date: Tue Nov 15 00:09:06 2005 -0800 [PATCH] Make sysctl.h (again) usable from userspace Make sysctl.h (again) useable from userspace Signed-off-by: Harald Welte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19842d67340e4a8f616552d344e97fc7452aa37a Author: Vivek Goyal Date: Tue Nov 15 00:09:04 2005 -0800 [PATCH] drop "[PATCH] i386 kexec-on-panic: Don't shutdown the apics" A patch by Eric was merged (f2b36db692b7ff6972320ad9839ae656a3b0ee3e) and later on reverted back (1e4c85f97fe26fbd70da12148b3992c0e00361fd). Along with above patch, another patch was posted and has been merged (3d1675b41b02d64bd1185903ea0d25a8c0bb6dea). That patch was dependent on the above patch and now it should also be reverted. Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eceab4ac8d9dd8955e0961fd7477664c087a9017 Author: Russell King Date: Tue Nov 15 11:31:41 2005 +0000 [ARM] Use kernel/power/Kconfig Rather than defining our own PM option, use kernel/power/Kconfig. This fixes build errors introduced by bca73e4bf8563d83f7856164caa44d5f42e44cca Signed-off-by: Russell King commit cbc5b2bb9e226c2b2b981836d2289912e2ef3c1c Author: Roland Dreier Date: Tue Nov 15 00:24:23 2005 -0800 [IB] mthca: don't disable RDMA writes if no responder resources Responder resources are only required to handle RDMA reads and atomic operations, not RDMA writes. So the driver should allow RDMA writes even if responder resources are set to 0. This is especially important for the UC transport -- with the old code, it was impossible to enable RDMA writes for UC QPs. Signed-off-by: Roland Dreier commit 47f2bce9021b4974ed33b072ebb8348c8145c946 Author: Roland Dreier Date: Tue Nov 15 00:19:21 2005 -0800 [IB] srp: don't post receive if no send buf available Have __srp_get_tx_iu() fail if the target port's request limit will not allow the initiator to post a send. This avoids continuing on and posting a receive, and then failing to post a corresponding send. If that happens, then the initiator will end up with an extra receive posted, and if this happens to much, the receive queue will overflow. Signed-off-by: Roland Dreier commit cf225356578326308b16a0fd03ff3fa72fe3da07 Author: Jochen Friedrich Date: Mon Nov 14 21:58:18 2005 -0800 [LLC]: Fix typo Signed-off-by: Jochen Friedrich Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 451677c46feb5fb39cb7f71035b8716064fcbd57 Author: Jochen Friedrich Date: Mon Nov 14 21:57:46 2005 -0800 [LLC]: Make core block on remote busy. Signed-off-by: Jochen Friedrich Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 59c6196e59a4b85d9c994e70ff20a460cdbaa003 Author: Jochen Friedrich Date: Mon Nov 14 21:57:15 2005 -0800 [LLC]: Fix TX window scaling Signed-off-by: Jochen Friedrich Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit cb422c464bdaeeb3b9ad4539010e357bf1bd1745 Author: Luiz Capitulino Date: Mon Nov 14 21:43:36 2005 -0800 [IPV6]: Fixes sparse warning in ipv6/ipv6_sockglue.c The patch below fixes the following sparse warning: net/ipv6/ipv6_sockglue.c:291:13: warning: Using plain integer as NULL