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 pointer Signed-off-by: Luiz Capitulino Signed-off-by: David S. Miller commit 12da2a435c1e8b9abb780d928ccbf04fc3d860a7 Author: Yan Zheng Date: Mon Nov 14 21:42:46 2005 -0800 [IPV6]: small fix for ipv6_dev_get_saddr(...) The "score.rule++" doesn't make any sense for me. According to codes above, I think it should be "hiscore.rule++;" . Signed-off-by: Yan Zheng Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit d3ee871e63d0a0c70413dc0aa5534b8d6cd6ec37 Author: Bob Picco Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Fix sparse mem Fix up booting with sparse mem enabled. Otherwise it would just cause an early PANIC at boot. Signed-off-by: Bob Picco Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8893166ff8694f36655009aa9bf8e7f2e1c9339f Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Increase the maximum number of local APICs to the maximum This is needed for large multinode IBM systems which have a sparse APIC space in clustered mode, fully covering the available 8 bits. The previous kernels would limit the local APIC number to 127, which caused it to reject some of the CPUs at boot. I increased the maximum and shrunk the apic_version array a bit to make up for that (the version is only 8 bit, so don't need an full int to store) Cc: Chris McDermott Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9e43e1b7c7c9872da032442d8e4bb112a02d16f4 Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Remove CONFIG_CHECKING and add command line option for pagefault tracing CONFIG_CHECKING covered some debugging code used in the early times of the port. But it wasn't even SMP safe for quite some time and the bugs it checked for seem to be gone. This patch removes all the code to verify GS at kernel entry. There haven't been any new bugs in this area for a long time. Previously it also covered the sysctl for the page fault tracing. That didn't make much sense because that code was unconditionally compiled in. I made that a boot option now because it is typically only useful at boot. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ffd10a2b77bca50dd05ba26acd5a6e68bcc8f61f Author: Magnus Damm Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Make node boundaries consistent The current x86_64 NUMA memory code is inconsequent when it comes to node memory ranges. The exact behaviour varies depending on which config option that is used. setup_node_bootmem() has start and end as arguments and these are used to calculate the size of the node like this: (end - start). This is all fine if end is pointing to the first non-available byte. The problem is that the current x86_64 code sometimes treats it as the last present byte and sometimes as the first non-available byte. The result is that some configurations might lose a page at the end of the range. This patch tries to fix CONFIG_ACPI_NUMA, CONFIG_K8_NUMA and CONFIG_NUMA_EMU so they all treat the end variable as the first non-available byte. This is the same way as the single node code. The patch is boot tested on dual x86_64 hardware with the above configurations, but maybe the removed code is needed as some workaround? Signed-off-by: Magnus Damm Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e583538f077d5f70191670b47a046ba436ec3428 Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Log machine checks from boot on Intel systems The logging for boot errors was turned off because it was broken on some AMD systems. But give Intel EM64T systems a chance because they are supposed to be correct there. The advantage is that there is a chance to actually log uncorrected machine checks after the reset. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b0bd35e622ffbda2c01dc67a0381c6a18817a29a Author: Ravikiran G Thirumalai Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Make ACPI NUMA and NUMA emulation peers of K8_NUMA in Kconfig On x86_64 arches, there is no way to choose ACPI_NUMA without having to choose K8_NUMA. CONFIG_K8_NUMA is not needed for Intel EM64T NUMA boxes. It also looks odd if you have to select ACPI_NUMA from the power management menu. This patch fixes those oddities. Patch does the following: 1. Makes NUMA a config option like other arches 2. Makes topology detection options like K8_NUMA dependent on NUMA 3. Choosing ACPI NUMA detection can be done from the standard "Processor type and features" menu AK: I fixed up the dependencies and changed the help texts a bit on top of Kiran's patch. Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit efbbdce94f6ea54cf06d9a06e4c95f6874ad64a8 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Use common sys_time64 Keeping this function does not makes sense because it's a copied (and buggy) copy of sys_time. The only difference is that now.tv_sec (which is a time_t, i.e. a 64-bit long) is copied (and truncated) into a int (32-bit). The prototype is the same (they both take a long __user *), so let's drop this and redirect it to sys_time (and make sure it exists by defining __ARCH_WANT_SYS_TIME). Only disadvantage is that the sys_stime definition is also compiled (may be fixed if needed by adding a separate __ARCH_WANT_SYS_STIME macro, and defining it for all arch's defining __ARCH_WANT_SYS_TIME except x86_64). Acked-by: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bf0f2e23834e2bf7d64b467ef07095b1c7e2c04b Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Set ____cacheline_maxaligned_in_smp alignment to 128 bytes The current value was correct before the introduction of Intel EM64T support - but now L1_CACHE_SHIFT_MAX can be less than L1_CACHE_SHIFT, which _is_ funny! Between the few users of ____cacheline_maxaligned_in_smp, we also have (for example) rcu_ctrlblk, and struct zone, with zone->{lru_,}lock. I.e. we have a lot of excess cacheline bouncing on them. No correctness issues, obviously. So this could even be merged for 2.6.14 (I'm not a fan of this idea, though). CC: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8e0d4f4e9132ae6e353f9cf27261627bcc7c65cc Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Remove asm-x86_64/rwsem.h Not needed since x86-64 always uses the spinlock based rwsems. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a5b250a428aabc619ace872f8220a7d0b8f7d557 Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Remove optimization for B stepping AMD K8 B stepping were the first shipping Opterons. memcpy/memset/copy_page/ clear_page had special optimized version for them. These are really old and in the minority now and the difference to the generic versions (using rep microcode) is not that big anyways. So just remove them. TODO: figure out optimized versions for Intel Netburst based EM64T Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a6f5deb2be4c82f24fefadcbf7e448f540c05ae6 Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Reduce number of retries for reset through keyboard controller Old code could retry for 10 seconds worst time. Only try it for one second now. Suggested by Yinghai Lu Cc: Yinghai.Lu@amd.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2b0918758dd68d6b8d01318a5200b65b9209760d Author: Siddha, Suresh B Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: x86_64/i386 fix Intel cache detection code assumption about threads sharing Fix the Intel cache detection code assumption that number of threads sharing the cache will either be equal to number of HT or core siblings. This also cleans up the code in general a bit. Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 94605eff572b727aaad9b4b29bc358b919096503 Author: Siddha, Suresh B Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86-64/i386: Intel HT, Multi core detection fixes Fields obtained through cpuid vector 0x1(ebx[16:23]) and vector 0x4(eax[14:25], eax[26:31]) indicate the maximum values and might not always be the same as what is available and what OS sees. So make sure "siblings" and "cpu cores" values in /proc/cpuinfo reflect the values as seen by OS instead of what cpuid instruction says. This will also fix the buggy BIOS cases (for example where cpuid on a single core cpu says there are "2" siblings, even when HT is disabled in the BIOS. http://bugzilla.kernel.org/show_bug.cgi?id=4359) Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e90f22edf432512219cc2952f5811961abbd164f Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Fix NUMA node lookup debug code which had bitrotted Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3506229ff9968e5dbc862a50285fbea0e8821b58 Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Don't enable interrupt unconditionally in reboot path When they were disabled before (e.g. after a panic) it's better to keep them off, otherwise followon panics can happen from timer interrupt handlers etc. Drawback is that pageup in the console won't work anymore though. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a88cde13bae3fffd6ecc812bdd02c91eafb6073e Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Formatting fixes for arch/x86_64/kernel/process.c No functional changes. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ea0be473a1f0ee89024a24d8ea4b05fbf6efcee3 Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Allow modular build of ia32 aout loader Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit af9c142de94ecf724a18700273bbba390873e072 Author: Shaohua Li Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Force correct address space size for MTRR on some 64bit Intel Xeons They report 40bit, but only have 36bits of physical address space. This caused problems with setting up the correct masks for MTRR. CPUID workaround for steppings 0F33h(supporting x86) and 0F34h(supporting x86 and EM64T). Detail info can be found at: http://download.intel.com/design/Xeon/specupdt/30240216.pdf http://download.intel.com/design/Pentium4/specupdt/30235221.pdf Signed-off-by: Shaohua Li Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1d2e6bd86152ab86fb866555281869df340e6c6a Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] AGP: Make gart iterator in K8 AGP driver SMP safe Ugh! Cc: davej@redhat.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 172efbb40333d0ca10ebaab11a98f9be687bee39 Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] AGP: Try unsupported AGP chipsets on x86-64 by default So far all new ones have worked and there isn't much variation because the CPU does all the interesting bits. So enable try unsupported by default. Can be still disabled with try_unsupported=0 (module) or amd64.try_unsupported=0 (boot option) Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 870b7681cd3f867c1ffc8d7fbe9b22216e73a536 Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] AGP: Support ULI/ALI 1689 bridge on AMD64 (no name because I'm not sure of the correct name) Cc: davej@redhat.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 529a340402e419f935d411ce0a085e96fcaf3872 Author: Eric Dumazet Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Optimize NUMA node hash function Compute the highest possible value for memnode_shift, in order to reduce footprint of memnodemap[] to the minimum, thus making all users (phys_to_nid(), kfree()), more cache friendly. Before the patch : Node 0 MemBase 0000000000000000 Limit 00000001ffffffff Node 1 MemBase 0000000200000000 Limit 00000003ffffffff Using 23 for the hash shift. Max adder is 3ffffffff After the patch : Node 0 MemBase 0000000000000000 Limit 00000001ffffffff Node 1 MemBase 0000000200000000 Limit 00000003ffffffff Using 33 for the hash shift. In this case, only 2 bytes of memnodemap[] are used, instead of 2048 Signed-off-by: Eric Dumazet Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e4e5d324b9c5586f408a72d1534474c449dd5212 Author: Bryan Ford Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Save/restore CS in 64bit signal handlers and force __USER_CS for CS This allows to run 64bit signal handlers in 64bit processes that run small code snippets in compat mode. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 420f8f68c9c5148dddf946bebdbc7eacde2172cb Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: New heuristics to find out hotpluggable CPUs. With a NR_CPUS==128 kernel with CPU hotplug enabled we would waste 4MB on per CPU data of all possible CPUs. The reason was that HOTPLUG always set up possible map to NR_CPUS cpus and then we need to allocate that much (each per CPU data is roughly ~32k now) The underlying problem is that ACPI didn't tell us how many hotplug CPUs the platform supports. So the old code just assumed all, which would lead to this memory wastage. This implements some new heuristics: - If the BIOS specified disabled CPUs in the ACPI/mptables assume they can be enabled later (this is bending the ACPI specification a bit, but seems like a obvious extension) - The user can overwrite it with a new additionals_cpus=NUM option - Otherwise use half of the available CPUs or 2, whatever is more. Cc: ashok.raj@intel.com Cc: len.brown@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 485832a5d928facd82f1525270d9f048da2063a1 Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Use int operations in spinlocks to support more than 128 CPUs spinning. Pointed out by Eric Dumazet Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8315eca25583c369e28f48909d3341dc21d6214d Author: Andi Kleen Date: Sat Nov 5 17:25:54 2005 +0100 [PATCH] x86_64: Some clarifications for Documention/x86_64/mm.txt I got some questions on this, so just fix up the documentation. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 59170891049cc469777a392e0b3f5aa7aad784a6 Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Replace swiotlb extern with include Minor victory on the continuous quest against all stray extern. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4d74dbd79a571b31f7cd2c69bb5e44368972bf93 Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Replace cpu_pda extern with include Minor cleanup - remove obsolete extern Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2bc0414ee04fd8bb798760801f5d7476dff44241 Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Only use asm/sections.h to declare section symbols Adding __initdata_* to asm-generic/sections.h Replaces a lot of open coded externs in arch/x86_64/* I had to change __bss_end to __bss_stop to match the other architectures. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6b75aeedde1e8a8513393d3c1367bf81bc5b0c67 Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Don't apply __PHYSICAL_MASK to page frame numbers It is for physical addresses, not for PFNs. Pointed out by Tejun Heo. Cc: htejun@gmail.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f6c2e3330d3fdd5474bc3756da46fca889a30e33 Author: Siddha, Suresh B Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Unmap NULL during early bootup We should zap the low mappings, as soon as possible, so that we can catch kernel bugs more effectively. Previously early boot had NULL mapped and didn't trap on NULL references. This patch introduces boot_level4_pgt, which will always have low identity addresses mapped. Druing boot, all the processors will use this as their level4 pgt. On BP, we will switch to init_level4_pgt as soon as we enter C code and zap the low mappings as soon as we are done with the usage of identity low mapped addresses. On AP's we will zap the low mappings as soon as we jump to C code. Signed-off-by: Suresh Siddha Signed-off-by: Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 69d81fcde7797342417591ba7affb372b9c86eae Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Speed up numa_node_id by putting it directly into the PDA Not go from the CPU number to an mapping array. Mode number is often used now in fast paths. This also adds a generic numa_node_id to all the topology includes Suggested by Eric Dumazet Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 50895c5d76e15d8af480eff1aaab5770cabbc2c2 Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Fix gcc 4 warning in aperture.c Fix arch/x86_64/kernel/aperture.c: In function #iommu_hole_init#: arch/x86_64/kernel/aperture.c:199: warning: #aper_order# may be used uninitialized in this function Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f5f786d0455c359c554b8f74783f887c0a2c9fac Author: Suresh Siddha Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86-64/i386: Fix CPU model for family 6 According to cpuid instruction in IA32 SDM-Vol2, when computing cpu model, we need to consider extended model ID for family 0x6 also. AK: Also added fixes/simplifcation from Petr Vandrovec Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e9b59d834faf0305cb6214a358f65f72c57b9e99 Author: Ashok Raj Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Remove duplicate __cpuinit define Remove duplicate __cpuinit in smp.c. Already defined in init.h which is already included. Signed-off-by: Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 47492d3667ec519172ab978bd8231b8c7152fa9d Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Use the DMA32 zone for dma_alloc_coherent()/pci_alloc_consistent Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 07808b74e7dab1aa385e698795875337d72daf7d Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Remove obsolete ARCH_HAS_ATOMIC_UNSIGNED and page_flags_t Has been introduced for x86-64 at some point to save memory in struct page, but has been obsolete for some time. Just remove it. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1dff7f3db5f045ccbfeca5bb00b0958a78501557 Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Fix up outdated pfn_to_page comment pfn_to_page really requires pfn_valid to be true now, no question. Some people stumbled over it, but it was misleading and wrong. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6004e1b7effcbb385a6b7c790e4b8008682cf679 Author: James Cleverdon Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] i386/x86-64: Share interrupt vectors when there is a large number of interrupt sources Here's a patch that builds on Natalie Protasevich's IRQ compression patch and tries to work for MPS boots as well as ACPI. It is meant for a 4-node IBM x460 NUMA box, which was dying because it had interrupt pins with GSI numbers > NR_IRQS and thus overflowed irq_desc. The problem is that this system has 270 GSIs (which are 1:1 mapped with I/O APIC RTEs) and an 8-node box would have 540. This is much bigger than NR_IRQS (224 for both i386 and x86_64). Also, there aren't enough vectors to go around. There are about 190 usable vectors, not counting the reserved ones and the unused vectors at 0x20 to 0x2F. So, my patch attempts to compress the GSI range and share vectors by sharing IRQs. Cc: "Protasevich, Natalie" Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 89b831ef8bf5cfbb357dbc0a2e07700d7f20eec5 Author: Jacob Shin Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Support for AMD specific MCE Threshold. MC4_MISC - DRAM Errors Threshold Register realized under AMD K8 Rev F. This register is used to count correctable and uncorrectable ECC errors that occur during DRAM read operations. The user may interface through sysfs files in order to change the threshold configuration. bank%d/error_count - reads current error count, write to clear. bank%d/interrupt_enable - set/clear interrupt enable. bank%d/threshold_limit - read/write the threshold limit. APIC vector 0xF9 in hw_irq.h. 5 software defined bank ids in mce.h. new apic.c function to setup threshold apic lvt. defaults to interrupt off, count enabled, and threshold limit max. sysfs interface created on /sys/devices/system/threshold. AK: added some ifdefs to make it compile on UP Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 979edfadbae2286eec5b46143c00e81bca96498e Author: Jan Beulich Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Adjust, correct, and complete the HPET definitions for x86-64. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e18c6874a505958d153a11f9d6947971c349008a Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Account mem_map in VM holes accounting The VM needs to know about lost memory in zones to accurately balance dirty pages. This patch accounts mem_map in there too, which fixes a constant errror of a few percent. Also some other misc mappings and the kernel text itself are accounted too. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b0d41693217b3bb5b837940dc7465e82a9d49476 Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: When cpu_up fails clean up page allocator properly Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fed644132f8ec4bf05b63f79c507c0acaa692c37 Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Make i386 compile again with fourth DMA32 zone The code should deal with an additional empty zone, so fix up the #error. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d1e3dfdc2c934a279bcfa19359e4daec02bda18f Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Set compatibility flag for 4GB zone on IA64 IA64 traditionally had a 4GB DMA32 zone. Set the compatibility flag to keep old drivers working. For new drivers it would be better to use ZONE_DMA32 now. Cc: tony.luck@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a2f1b424900715ed9d1699c3bb88a434a2b42bc0 Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Add 4GB DMA32 zone Add a new 4GB GFP_DMA32 zone between the GFP_DMA and GFP_NORMAL zones. As a bit of historical background: when the x86-64 port was originally designed we had some discussion if we should use a 16MB DMA zone like i386 or a 4GB DMA zone like IA64 or both. Both was ruled out at this point because it was in early 2.4 when VM is still quite shakey and had bad troubles even dealing with one DMA zone. We settled on the 16MB DMA zone mainly because we worried about older soundcards and the floppy. But this has always caused problems since then because device drivers had trouble getting enough DMA able memory. These days the VM works much better and the wide use of NUMA has proven it can deal with many zones successfully. So this patch adds both zones. This helps drivers who need a lot of memory below 4GB because their hardware is not accessing more (graphic drivers - proprietary and free ones, video frame buffer drivers, sound drivers etc.). Previously they could only use IOMMU+16MB GFP_DMA, which was not enough memory. Another common problem is that hardware who has full memory addressing for >4GB misses it for some control structures in memory (like transmit rings or other metadata). They tended to allocate memory in the 16MB GFP_DMA or the IOMMU/swiotlb then using pci_alloc_consistent, but that can tie up a lot of precious 16MB GFPDMA/IOMMU/swiotlb memory (even on AMD systems the IOMMU tends to be quite small) especially if you have many devices. With the new zone pci_alloc_consistent can just put this stuff into memory below 4GB which works better. One argument was still if the zone should be 4GB or 2GB. The main motivation for 2GB would be an unnamed not so unpopular hardware raid controller (mostly found in older machines from a particular four letter company) who has a strange 2GB restriction in firmware. But that one works ok with swiotlb/IOMMU anyways, so it doesn't really need GFP_DMA32. I chose 4GB to be compatible with IA64 and because it seems to be the most common restriction. The new zone is so far added only for x86-64. For other architectures who don't set up this new zone nothing changes. Architectures can set a compatibility define in Kconfig CONFIG_DMA_IS_DMA32 that will define GFP_DMA32 as GFP_DMA. Otherwise it's a nop because on 32bit architectures it's normally not needed because GFP_NORMAL (=0) is DMA able enough. One problem is still that GFP_DMA means different things on different architectures. e.g. some drivers used to have #ifdef ia64 use GFP_DMA (trusting it to be 4GB) #elif __x86_64__ (use other hacks like the swiotlb because 16MB is not enough) ... . This was quite ugly and is now obsolete. These should be now converted to use GFP_DMA32 unconditionally. I haven't done this yet. Or best only use pci_alloc_consistent/dma_alloc_coherent which will use GFP_DMA32 transparently. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 56720367cd89ef5265f39da2d674c5b92cd4cd87 Author: Andi Kleen Date: Sat Nov 5 17:25:53 2005 +0100 [PATCH] x86_64: Update defconfig Rerun and enable autofs 4, relayfs and softdog Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ba76cd575ffd461d83507c23cf53c78d56d1ea0a Author: Paul Mackerras Date: Mon Nov 14 21:56:57 2005 +1100 powerpc: Remove __init from a function used in suspend/resume. Suspend/resume on powermacs uses the pmac_get_boot_time function, so it can't be marked as __init. Signed-off-by: Paul Mackerras commit a272e24cc8751d125f9582befed0213a2a2b270f Author: Paul Mackerras Date: Mon Nov 14 21:55:48 2005 +1100 powerpc: Remove an extraneous and incorrect declaration of pmac_nvram_init. Signed-off-by: Paul Mackerras commit cc657f53928997c65bf2409c45166c6ceee8d306 Author: Paul Mackerras Date: Mon Nov 14 21:55:15 2005 +1100 powerpc: Fix clearing of the FPSCR when invoking a signal handler As pointed out by Gary Byers, we were clearing the image of the FPSCR (floating point status and control register) in the thread_struct before copying it to the user stack when invoking a signal. Thus the task would see its FPSCR getting cleared when it took a signal. While fixing it I noticed that our swapcontext system call was also clearing FPSCR. It shouldn't, so I fixed that too. Signed-off-by: Paul Mackerras commit 302fe1758d85ad9c868e77625f61b7edad106381 Author: Yasuyuki Kozakai Date: Mon Nov 14 15:28:45 2005 -0800 [NETFILTER] fix leak of fragment queue at unloading nf_conntrack_ipv6 This patch makes nf_conntrack_ipv6 free all IPv6 fragment queues at module unloading time. Also introduce a BUG_ON if we ever again have leaks in the memory accounting. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 1ba430bc3e243d38c0bb2b185bea664b04fc59df Author: Yasuyuki Kozakai Date: Mon Nov 14 15:28:18 2005 -0800 [NETFILTER] nf_conntrack: fix possibility of infinite loop while evicting nf_ct_frag6_queue This synchronizes nf_ct_reasm with ipv6 reassembly, and fixes a possibility of an infinite loop if CPUs evict and create nf_ct_frag6_queue in parallel. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 7686a02c0ebc11e4f881fe14db3df18569b7dbc1 Author: Yasuyuki Kozakai Date: Mon Nov 14 15:27:43 2005 -0800 [NETFILTER]: fix type of sysctl variables in nf_conntrack_ipv6 These variables should be unsigned. This fixes sysctl handler for nf_ct_frag6_{low,high}_thresh. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 9bdf87d90bbd1a3e3183ac116a6a9d861f32baca Author: Yasuyuki Kozakai Date: Mon Nov 14 15:26:58 2005 -0800 [NETFILTER]: cleanup IPv6 Netfilter Kconfig This removes linux 2.4 configs in comments as TODO lists. And this also move the entry of nf_conntrack to top like IPv4 Netfilter Kconfig. Based on original patch by Krzysztof Piotr Oledzki . Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 47d4305bf2275f82a51fa025257c2c1996356d6b Author: Krzysztof Oledzki Date: Mon Nov 14 15:25:59 2005 -0800 [NETFILTER]: link 'netfilter' before ipv4 Staticaly linked nf_conntrack_ipv4 requires nf_conntrack. but currently nf_conntrack is linked after it. This changes the order of ipv4 and netfilter to fix this. Signed-off-by: Krzysztof Oledzki Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 37d2e7a20d745035b600f1a6be56cbb9c7259419 Author: Harald Welte Date: Mon Nov 14 15:24:59 2005 -0800 [NETFILTER] nfnetlink: unconditionally require CAP_NET_ADMIN This patch unconditionally requires CAP_NET_ADMIN for all nfnetlink messages. It also removes the per-message cap_required field, since all existing subsystems use CAP_NET_ADMIN for all their messages anyway. Patrick McHardy owes me a beer if we ever need to re-introduce this. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 3746a2b1402e7933c7f1eabdce384b8454dc2ef7 Author: KOVACS Krisztian Date: Mon Nov 14 15:23:01 2005 -0800 [NETFILTER] nf_conntrack: Add missing code to TCP conntrack module Looks like the nf_conntrack TCP code was slightly mismerged: it does not contain an else branch present in the IPv4 version. Let's add that code and make the testsuite happy. Signed-off-by: KOVACS Krisztian Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 56558208521729fa6b2a0f12df22e1569dee297a Author: Pablo Neira Ayuso Date: Mon Nov 14 15:22:11 2005 -0800 [NETFILTER] ctnetlink: More thorough size checking of attributes Add missing size checks. Thanks Patrick McHardy for the hint. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit c0400c4f5a08cfd1c657f7f616fcf1dfbd76a4d7 Author: Pablo Neira Ayuso Date: Mon Nov 14 15:21:41 2005 -0800 [NETFILTER] nfnetlink: skip size check if size not specified (== 0) Skip sizecheck if the size of the attribute wasn't specified, ie. zero. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit dbd36ea496726460299842fdbeaaa7fff2f0c5c7 Author: Pablo Neira Ayuso Date: Mon Nov 14 15:21:01 2005 -0800 [NETFILTER] ctnetlink: use size_t to make gcc-4.x happy Make gcc-4.x happy. Use size_t instead of int. Thanks to Patrick McHardy for the hint. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit c6e6e666cbfe40f0d7fb1a293ff6332973acac37 Author: Jeff Garzik Date: Mon Nov 14 14:50:05 2005 -0500 [libata] REQUEST SENSE handling fixes - Move ATAPI check-condition handling out of the timeout handler - Use multi-qc-issue feature to issue REQUEST SENSE ATAPI PACKET command upon receiving an ATAPI check-condition. This cleans things up a lot, and eliminates a nasty recursion bug. commit 2c13b7cee045af689b36349c2bc6a9ed6e3d73fa Author: Jeff Garzik Date: Mon Nov 14 14:14:16 2005 -0500 [libata] minor fixes, new helpers - in ata_dev_identify(), don't assume that all devices are either ATA or ATAPI. In the future, this code will see port multipliers and other devices. - make a debugging printk less verbose - add new helper ata_qc_reinit() - add new helper BPRINTK() and port flag ATA_FLAG_DEBUGMSG, for fine-grained debugging use. commit e1410f2d951d45aee3bdbcc05ecedaaa9db276e5 Author: Jeff Garzik Date: Mon Nov 14 14:06:26 2005 -0500 [libata] fix bugs in ATAPI padding DMA mapping code The ATAPI pad-to-next-32bit-boundary code modifies the scatterlist's length variable, sometimes to zero. x86-64 platform would oops if a zero-length scatterlist entry was asked to be mapped. Work around this by ensuring that we never DMA-map a zero length buffer or SG entry. commit ad36d1a533da91d3448029b4da1113c5b880f25d Author: Jeff Garzik Date: Mon Nov 14 13:56:37 2005 -0500 [libata ahci] error handling fixes Needed to get ATAPI working. - dump hardware error bits, if hardware signals an error - only reset hardware during timeout if a command was active - call ata_qc_complete() with a fine-grained error mask. Needed so that atapi_qc_complete() can distinguish between device errors and other errors. commit 493f25ef4087395891c99fcfe2c72e62e293e89f Author: Paul Mackerras Date: Mon Nov 14 17:32:50 2005 +1100 powerpc: Fix 32-bit compile: PPC_MEMSTART was undeclared This defines PPC_MEMSTART as 0 because it is still used in a couple of places in the 32-bit code. Signed-off-by: Paul Mackerras commit 5be396b00ca0f2f769c55cf69bbd7c77451c925e Author: Paul Mackerras Date: Mon Nov 14 17:31:55 2005 +1100 powerpc: Mark PREP and embedded as broken for now These machines don't have working ARCH=powerpc support yet, so make them depend on BROKEN so people don't enable them inadvertently and get compile errors. Signed-off-by: Paul Mackerras commit 1dfc6772097ef4eadd39a10ce44557c782d5058e Author: Paul Mackerras Date: Mon Nov 14 17:30:40 2005 +1100 powerpc: Export a couple of prom functions These are needed by the TPM driver, apparently. Signed-off-by: Paul Mackerras commit 7568cb4ef6c507164b65b01f972a3bd026898ae1 Author: Paul Mackerras Date: Mon Nov 14 17:30:17 2005 +1100 powerpc: Move most remaining ppc64 files over to arch/powerpc Also deletes files in arch/ppc64 that are no longer used now that we don't compile with ARCH=ppc64 any more. Signed-off-by: Paul Mackerras commit c55377ee73f6efeb373ae06f6e918d87660b4852 Author: Paul Mackerras Date: Mon Nov 14 17:22:01 2005 +1100 powerpc: Move a bunch of ppc64 headers to include/asm-powerpc ... and also delete some that are no longer used because we already had an include/asm-powerpc version of the header. Signed-off-by: Paul Mackerras commit d7867959e7e928ab52ef204e2559937e5c9fc4ce Author: Stephen Rothwell Date: Mon Nov 14 17:14:51 2005 +1100 powerpc: iSeries build fixes log_plpar_hcall_return is only used on PPC_PSERIES, so move it closer to its users and inside ifdef CONFIG_PPC_PSERIES. remove the last vestiges of systemcfg in iSeries. Signed-off-by: Stephen Rothwell commit 3136254ca5dfaf53486f7032c674f9b6d7fd1d53 Author: Benjamin Herrenschmidt Date: Mon Nov 14 15:49:48 2005 +1100 [PATCH] powerpc: kill ppc64 rtc.c, use genrtc instead This moves the rtas RTC callbacks to rtas-rtc.c in arch/powerpc/kernel, and kills the rest of arch/ppc64/kernel/rtc.c which was just a duplicate of the genrtc functionality. Also enable build of genrtc for CONFIG_PPC64 (it just works are we already have the required callbacks) and enable it in all defconfigs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 0c37ec2aa88bd8a6aaeb284ff5c86f4c6d8e8469 Author: Benjamin Herrenschmidt Date: Mon Nov 14 14:55:58 2005 +1100 [PATCH] powerpc: vdso fixes (take #2) This fixes various errors in the new functions added in the vDSO's, I've now verified all functions on both 32 and 64 bits vDSOs. It also fix a sign extension bug getting the initial time of day at boot that could cause the monotonic clock value to be completely on bogus for 64 bits applications (with either the vDSO or the syscall) on powermacs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 50092b233afa96b4c9a4b24ac38199c34e0880cd Author: Benjamin Herrenschmidt Date: Mon Nov 14 11:02:20 2005 +1100 [PATCH] powerpc: Always rebuild arch/powerpc/include/asm symlink This patch uses a FORCE dependency on the arch/powerpc/include/asm symlink so that it always gets rebuilt, thus avoiding all sort of funny errors if the .config is changed between 32 and 64 bits. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 593e537b93193d1696809817533ce5ad510445b1 Author: Michael Ellerman Date: Sat Nov 12 00:06:06 2005 +1100 [PATCH] powerpc: Export htab start/end via device tree The userspace kexec-tools need to know the location of the htab on non-lpar machines, as well as the end of the kernel. Export via the device tree. NB. This patch has been updated to use "linux,x" property names. You may need to update your kexec-tools to match. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit c5e24354efae9f962e0e369d875d45f47e0bb9aa Author: Michael Ellerman Date: Sat Nov 12 00:06:05 2005 +1100 [PATCH] powerpc: Turn cpu_irq_down into kexec_cpu_down We currently have a ppc_md member called cpu_irq_down, which disables IRQs for the cpu in question. The only caller of cpu_irq_down is the kexec code. On pSeries we need to do more than just teardown IRQs at kexec time, so rename the ppc_md member to kexec_cpu_down and expand it. The pSeries code needs to know, and other platforms might too, whether we're doing a crash shutdown (ie. panicking) or a regular kexec, so add a flag for that. The pSeries implementation of kexec_cpu_down does an unregister VPA call, which tells the Hypervisor to stop writing stuff into our pacas. Without this we can get weird memory corruption bugs when we kexec, caused by the Hypervisor writing into the first kernel's pacas which happens to be somewhere interesting in the second kernel's memory. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 5cd16ee934eafca74a6bb790328950cec68a8b78 Author: Michael Ellerman Date: Fri Nov 11 14:25:24 2005 +1100 [PATCH] powerpc: Merge page.h Merge asm-ppc/page.h and asm-ppc64/page.h into asm-powerpc/page.h, asm-powerpc/page_32.h and asm-powerpc/page_64.h Built for PPC (common_defconfig), with ARCH=powerpc, mostly built with ARCH=ppc (other things break the build). Built and booted on P5 LPAR for PPC64 with ARCH=ppc/powerpc (pseries_defconfig). Mostly built for iSeries powerpc. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 868accb7b9126dffdebb6b45631e145991e3535d Author: Stephen Rothwell Date: Thu Nov 10 18:38:46 2005 +1100 powerpc: have only one definition of __irq_offset_value Signed-off-by: Stephen Rothwell commit d9ae2bad5c92cd116e3daedf16f79cf597e09ad7 Author: Stephen Rothwell Date: Thu Nov 10 18:11:19 2005 +1100 powerpc: make iSeries use generic virtual irq mapping Signed-off-by: Stephen Rothwell commit 71f95cfbcfc31ba0d002ddb6e37ca5a0b5eaf02c Author: Martin Waitz Date: Sun Nov 13 16:08:15 2005 -0800 [PATCH] DocBook: revert xmlto use for .ps and .pdf documentation As xmlto doesn't work for print documentation, we need docbook-utils again for these targets. This patch allows the user to choose the method he wants to use. (I'm still hoping that someone will fix passivetex ;-) Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e56367fe70955beb82e5e7c71ccfa064add42c21 Author: Martin Waitz Date: Sun Nov 13 16:08:15 2005 -0800 [PATCH] DocBook: comment about paper type Add a comment showing how to change paper type. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddad86c2d6f660112c6ce8aabae6ffd346e25b9b Author: Martin Waitz Date: Sun Nov 13 16:08:14 2005 -0800 [PATCH] DocBook: include printk documentation Add printk documentation to kernel-api. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aeec46b97a7975fd983219177980c58ed4fd607c Author: Martin Waitz Date: Sun Nov 13 16:08:13 2005 -0800 [PATCH] DocBook: allow to mark structure members private Many structures contain both an internal part and one which is part of the API to other modules. With this patch it is possible to only include these public members in the kernel documentation. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5f4917c92a9a3814eda9c947fda8afabbd1812d Author: Jan Beulich Date: Sun Nov 13 16:08:12 2005 -0800 [PATCH] make vesafb build without CONFIG_MTRR vesafb did not build without CONFIG_MTRR. Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60f6c464d14b177778334344c86f15616899735a Author: Hans Verkuil Date: Sun Nov 13 16:08:12 2005 -0800 [PATCH] v4l: 976: ensure consistent v4l firmware prefixes Ensure consistent v4l firmware prefixes. Signed-off-by: Hans Verkuil Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3e63002433d9a3de763b6cb49dc2c75a74d8604 Author: Mauro Carvalho Chehab Date: Sun Nov 13 16:08:11 2005 -0800 [PATCH] v4l: 977: fix broken dependency needed for sa7134 module Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5ee43afc9fdde8f853346d32f5ca5c00e8ed886 Author: Ricardo Cerqueira Date: Sun Nov 13 16:08:10 2005 -0800 [PATCH] v4l: 975: apply saa7134-alsa fixes Merged parts of a patch from Takashi Iwai for an older version of the module. This patch was adapted and tested by Ricardo Cerqueira. Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c01ee851d3e64753877017e8fb19f2e23a1945bc Author: Michael Krufky Date: Sun Nov 13 16:08:09 2005 -0800 [PATCH] v4l: 974: saa7134 shouldn't DEPEND on SND_PCM_OSS. Instead, SELECT it. saa7134 shouldn't DEPEND on SND_PCM_OSS. Instead, SELECT it. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93067f387e104e48e616436fe1804911f90402e3 Author: Dave Jones Date: Sun Nov 13 16:08:09 2005 -0800 [PATCH] v4l: saa711x driver doesn't need segment.h This breaks compilation on non-x86 architectures, and isn't even used. Signed-off-by: Dave Jones Acked-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24b59258eb987c26c5813d7768c516422830db35 Author: Mike Krufky Date: Sun Nov 13 16:08:08 2005 -0800 [PATCH] v4l: prevent saa7134 alsa undefined warnings Prevent the following build warnings: *** Warning: "snd_card_free" *** Warning: "snd_card_register" *** Warning: "snd_device_new" *** Warning: "snd_card_new" *** Warning: "snd_ctl_add" *** Warning: "snd_ctl_new1" *** Warning: "snd_pcm_set_ops" *** Warning: "snd_pcm_new" *** Warning: "snd_pcm_lib_ioctl" *** Warning: "snd_pcm_hw_constraint_integer" *** Warning: "snd_pcm_stop" *** Warning: "snd_pcm_period_elapsed" [drivers/media/video/saa7134/saa7134-alsa.ko] undefined! Signed-off-by: Michael Krufky Acked-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e77f34d6948af83db75ece2e1bc0c73087d7cf69 Author: Mauro Carvalho Chehab Date: Sun Nov 13 16:08:06 2005 -0800 [PATCH] v4l: (966.1) Removes Obsoleted i2c-compat.h from newer drivers Removed obsoleted i2c-compat.h file from cx25840, saa7115 and saa7127 drivers. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f4b33651cfb18caac6b6a0d664b0750074b14f4 Author: Hans Verkuil Date: Sun Nov 13 16:08:05 2005 -0800 [PATCH] v4l: (966) Authorship fixes for new Modules Fixes Module Author macros Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e19b2fcccde976621560c26373c7fba29b0d0f29 Author: Hans Verkuil Date: Sun Nov 13 16:08:04 2005 -0800 [PATCH] v4l: (948) adds support for saa7115 video decoder - Adds support for saa7115 video decoder. Driver Authors: Hans Verkuil, Chris Kennedy, Kevin Thayer Signed-off-by: Hans Verkuil Signed-off-by: Chris Kennedy Signed-off-by: Kevin Thayer Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e1e28da4059ce293334a8e820955a0ce320b07b Author: Michael Krufky Date: Sun Nov 13 16:08:03 2005 -0800 [PATCH] v4l: (963.1) hybrid v4l/dvb: remove duplicated code The following patch caused some duplicated code in cx88-dvb.c: [PATCH] v4l: 634: implemented tuner set standby on cx88 init The cx88-dvb.c portion of this patch was already applied in an earlier patch, entitled: [PATCH] v4l: fixup on cx88_dvb for Dvico HDTV5 Gold I love quilt and all, but AFAIK, no tool is 100% perfect for catching oversights like this. The non-overlapping portions of each of these patches are still needed, and must not be discarded, so rather than reverting old patches, please just apply this fixup patch to remove the duplicated code. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6555f4322f5c8dc03047eb566d8519ba348e02de Author: Mauro Carvalho Chehab Date: Sun Nov 13 16:08:02 2005 -0800 [PATCH] v4l: (963) em28xx IR fixup Removed the code that avoids repeating events when pressing IR keys. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80d2ad9259b04bc46556c1cd8cec558a02460a2d Author: Ricardo Cerqueira Date: Sun Nov 13 16:08:01 2005 -0800 [PATCH] v4l: (962) Added new saa7134 card (MSI TV@anywhere plus) Added new saa7134 card (MSI TV@anywhere plus) Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3717e170e1585d79a8ceced9161f18ceb796411e Author: Tyler Trafford Date: Sun Nov 13 16:08:00 2005 -0800 [PATCH] v4l: (958) Make cx25840 use firmware image named 'cx25840.fw' Change default filename of firmware image to 'cx25840.fw' Signed-off-by: Tyler Trafford Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4aabf6331f89c18a46e7f083ca0b27f15ca85422 Author: Ricardo Cerqueira Date: Sun Nov 13 16:08:00 2005 -0800 [PATCH] v4l: (951) Make saa7134-oss as a stand-alone module - saa7134-oss is now a standalone module as well - remaining DMA sound code has been removed from core the module - Lots of small cleanups and variable renames to get more consistency between the OSS and ALSA drivers - Fixed saa7134-alsa spinlock bug - Added missing #include in saa7134-oss Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 714a095abfa22dfe2accf641118a65796e966a98 Author: Mauro Carvalho Chehab Date: Sun Nov 13 16:07:59 2005 -0800 [PATCH] v4l: (950) Added compiler options for cx25840 saa7115 and saa7127 Added compiler options for cx25840, saa7115 and saa7127 Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70146cfc84dca917ac27cdc754deae63c1282844 Author: Hartmut Hackmann Date: Sun Nov 13 16:07:58 2005 -0800 [PATCH] v4l: (949) Added support for secam l' Added support for SECAM L' Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd985160a9f4623fdb24fcfeb36fe59e1b8f7b57 Author: Hans Verkuil Date: Sun Nov 13 16:07:56 2005 -0800 [PATCH] v4l: (946) adds support for cx25840 video decoder Adds support for cx25840 video decoder. Driver authors: Hans Verkuil, Chris Kennedy, Tyler Trafford, Ulf Eklund. Signed-off-by: Hans Verkuil Signed-off-by: Chris Kennedy Signed-off-by: Tyler Trafford Thanks-to: Ulf Eklund . Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2f0648ffda862d53f04f0a05979f3fa530d63c9 Author: Hans Verkuil Date: Sun Nov 13 16:07:55 2005 -0800 [PATCH] v4l: (945) adds a new include for internal v4l2 ioctls and api Adds a new include for internal V4L2 ioctls and API Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 419d4e753a5dbd6e19ad45cb4045ac213f15eac4 Author: Andrew Morton Date: Sun Nov 13 16:07:55 2005 -0800 [PATCH] v4l-944-added-driver-for-saa7127-video-tidy Remove unneeded (and undesirable) casts. Cc: Hans Verkuil Cc: Chris Kennedy Cc: Kevin Thayer Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfbb5b8cb059609696ba38a9a87eafb93b3de43c Author: Hans Verkuil Date: Sun Nov 13 16:07:53 2005 -0800 [PATCH] v4l: (944) added driver for saa7127 video decoder - Added driver for saa7127 video decoder. Driver authors:Hans Verkuil, Chris Kennedy, Kevin Thayer Signed-off-by: Hans Verkuil Signed-off-by: Chris Kennedy Signed-off-by: Kevin Thayer Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c6c0b2c27e70c3593e023882fabb1cebcbd077e Author: Mark Weaver Date: Sun Nov 13 16:07:52 2005 -0800 [PATCH] v4l: (939) Support for nebula rc5 based gpio remote Support for Nebula rc5-based gpio remote. Signed-off-by: Mark Weaver Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 871242b93e75b24c99687249c2812aed026b40af Author: Nickolay V. Shmyrev Date: Sun Nov 13 16:07:51 2005 -0800 [PATCH] v4l: (937) Included missing interrupt.h at saa7134-alsa.c Included missing interrupt.h at saa7134-alsa.c Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 633323ffffae91c3f22a08e0185fbfd3fae2a825 Author: Bill Pechter Date: Sun Nov 13 16:07:50 2005 -0800 [PATCH] v4l:: (936) Support for sabrent bt848 version Support for Sabrent bt848 version. Signed-off-by: Bill Pechter Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8069695c9e7da7ab7cd8ee749e8d5aa9e6e0660b Author: Ricardo Cerqueira Date: Sun Nov 13 16:07:49 2005 -0800 [PATCH] v4l: (935) Moved common IR stuff to ir-common.c - The pinnacle handler & remote are common to saa7134 PCI boards and em28xx USB boards, so the keymap was moved to ir-common and the keyhandler is back to ir-kbd-i2c - request_module("ir-kbd-i2c") is no longer necessary at saa7134-core since saa7134.ko now depends on ir-kbd-i2c.ko to get the keyhandler Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 800d3c6f90b61cc82b09db635b59c00b1c460728 Author: Mauro Carvalho Chehab Date: Sun Nov 13 16:07:48 2005 -0800 [PATCH] v4l: (943) added secam l video standard - Added SECAM L' video standard - SECAM L' is a Secam variant that requires special config. This patch adds support on V4L core. Requires aditional patches on tuners to support. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c817e7634260b298fc03b856ddb53d9aa77326b5 Author: Ricardo Cerqueira Date: Sun Nov 13 16:07:47 2005 -0800 [PATCH] v4l: (930) Alsa fixes and improvements - Fix nasty IRQ hook bug. - Fix multiple board support in saa7134-alsa - Minor comment updates - SAA7134/ALSA IRQ management improvements - Removed superfluous stop_dma() from saa7134-alsa IRQ handler Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 770599d07564f049234d0a5eb0ef3d607d747878 Author: Mauro Carvalho Chehab Date: Sun Nov 13 16:07:45 2005 -0800 [PATCH] v4l: (926.1) Added compiling options for wm8775 and cs53l32a chips Added compiling options for wm8775 and cs53l32a chips. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ad44229ec85b3938a313a325f0449e23eac8aac Author: Jesper Juhl Date: Sun Nov 13 16:07:44 2005 -0800 [PATCH] README: add info about -stable to README and point at applying-patches.txt Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f39894d1b5c253b10fcb8fbbbcf65a330f6cdc7 Author: George Anzinger Date: Sun Nov 13 16:07:44 2005 -0800 [PATCH] timespec: normalize off by one errors It would appear that the timespec normalize code has an off by one error. Found in three places. Thanks to Ben for spotting. Signed-off-by: George Anzinger Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09e12f9f6bcd9af516d901223cebdbae58b32c9f Author: Kylene Jo Hall Date: Sun Nov 13 16:07:43 2005 -0800 [PATCH] tpm: locking fix Use schedule_work() to avoid down()-in-timer-handler problem. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6a2382cec3ed9b67b01febfa85d7d72b254844a Author: Kylene Jo Hall Date: Sun Nov 13 16:07:42 2005 -0800 [PATCH] tpm: dev_mask handling fix - Use ~, not ! - Remove unneeded cast Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad5ea3cc5f745aef243ade0dafc8cf6f7f0bfea7 Author: Kylene Jo Hall Date: Sun Nov 13 16:07:41 2005 -0800 [PATCH] tpm: updates for new hardware This is the patch to support TPMs on power ppc hardware. It has been reworked as requested to remove the need for messing with the io page mask by just using ioremap. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0131c143204ee0ba00592c016f20ce6fc67827d Author: Kylene Jo Hall Date: Sun Nov 13 16:07:41 2005 -0800 [PATCH] tpm: necessary PPC64 function exports Some work is needed in the tpm device driver to discover the TPM out of the device tree rather than based on set address on Power PPC. This patch exports a couple of functions for the parsing. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36174494b64ec0f6c2593af12d1cec97c9754192 Author: Diego Calleja Date: Sun Nov 13 16:07:40 2005 -0800 [PATCH] oops-tracing: mention digital photos Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 113fab1386f0093602d9f48b424b945cafd3db23 Author: matthieu castet Date: Sun Nov 13 16:07:39 2005 -0800 [PATCH] fix leaks in request_firmware_nowait Wasn't checking return error and forgot to free in some case. Signed-off-by: Matthieu CASTET Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff6ed4063da39e6a30ce904005e4ed17385e2739 Author: Andrew Morton Date: Sun Nov 13 16:07:38 2005 -0800 [PATCH] acct.h needs jiffies.h allnoconfig: In file included from fs/super.c:28: include/linux/acct.h:173: warning: `TICK_NSEC' is not defined Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec63f22dc31de19b273b7aca66e73ae85cc2418e Author: Johann Lombardi Date: Sun Nov 13 16:07:36 2005 -0800 [PATCH] ext2: remove duplicate newlines in ext2_fill_super ext2_warning() already adds a newline. Signed-off-by: Johann Lombardi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ef1c49f8f9f0d6b5b8d57bb4b66c605a3d65876 Author: Zach Brown Date: Sun Nov 13 16:07:35 2005 -0800 [PATCH] aio: don't ref kioctx after decref in put_ioctx put_ioctx's refcount debugging was doing an atomic_read after dropping its reference when it wasn't the last ref, leaving a tiny race for another freeing thread to sneak into. This shifts the debugging before the ops, uses BUG_ON, and reformats the defines a little. Sadly, moving to inlines increased the code size but this change decreases the code size by a whole 9 bytes :) Signed-off-by: Zach Brown Cc: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d00689af6b3b6ba9e1fdefec3bd62edc860c385d Author: Zach Brown Date: Sun Nov 13 16:07:34 2005 -0800 [PATCH] aio: replace locking comments with assert_spin_locked() aio: replace locking comments with assert_spin_locked() Signed-off-by: Zach Brown Acked-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20dcae32439384b6863c626bb3b2a09bed65b33e Author: Zach Brown Date: Sun Nov 13 16:07:33 2005 -0800 [PATCH] aio: remove kioctx from mm_struct Sync iocbs have a life cycle that don't need a kioctx. Their retrying, if any, is done in the context of their owner who has allocated them on the stack. The sole user of a sync iocb's ctx reference was aio_complete() checking for an elevated iocb ref count that could never happen. No path which grabs an iocb ref has access to sync iocbs. If we were to implement sync iocb cancelation it would be done by the owner of the iocb using its on-stack reference. Removing this chunk from aio_complete allows us to remove the entire kioctx instance from mm_struct, reducing its size by a third. On a i386 testing box the slab size went from 768 to 504 bytes and from 5 to 8 per page. Signed-off-by: Zach Brown Acked-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4557398f8cbaf9f254cff747534b4724c7f75c4f Author: Kirill Korotaev Date: Sun Nov 13 16:07:30 2005 -0800 [PATCH] stop_machine() vs. synchronous IPI send deadlock This fixes deadlock of stop_machine() vs. synchronous IPI send. The problem is that stop_machine() disables interrupts before disabling preemption on other CPUs. So if another CPU is preempted and then calls something like flush_tlb_all() it will deadlock with CPU doing stop_machine() and which can't process IPI due to disabled IRQs. I changed stop_machine() to do the same things exactly as it does on other CPUs, i.e. it should disable preemption first on _all_ CPUs including itself and only after that disable IRQs. Signed-off-by: Kirill Korotaev Cc: Rusty Russell Cc: "Andrey Savochkin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5b609797b8e212dbfaf23944da8bf8c53233d5c Author: Clemens Buchacher Date: Sun Nov 13 16:07:26 2005 -0800 [PATCH] arch/mips/au1000/common/usbdev.c: don't concatenate __FUNCTION__ with strings It's deprecated. Use "%s", __FUNCTION__ instead. Signed-off-by: Clemens Buchacher Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8426e1f6af0fd7f44d040af7263750c5a52f3cc3 Author: Nick Piggin Date: Sun Nov 13 16:07:25 2005 -0800 [PATCH] atomic: inc_not_zero Introduce an atomic_inc_not_zero operation. Make this a special case of atomic_add_unless because lockless pagecache actually wants atomic_inc_not_negativeone due to its offset refcount. Signed-off-by: Nick Piggin Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a6dae6d382e9edf3ff440b819e554ed706359bc Author: Nick Piggin Date: Sun Nov 13 16:07:24 2005 -0800 [PATCH] atomic: cmpxchg Introduce an atomic_cmpxchg operation. Signed-off-by: Nick Piggin Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53e86b91b7ae66d4c2757195cbd42e00d9199cf2 Author: Nick Piggin Date: Sun Nov 13 16:07:23 2005 -0800 [PATCH] i386: generic cmpxchg - Make cmpxchg generally available on the i386 platform. - Provide emulation of cmpxchg suitable for uniprocessor if built and run on 386. From: Christoph Lameter - Cut down patch and small style changes. Signed-off-by: Nick Piggin Signed-off-by: Christoph Lameter Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbdf65b1b7f8ec48bda1604cfea7ac09ce583d6b Author: Ingo Molnar Date: Sun Nov 13 16:07:22 2005 -0800 [PATCH] rcutorture: renice to low priority Make the box usable for interactive work when running the RCU torture test, by renicing the RCU torture-test threads to +19 by default. Kthreads run at nice -5 by default. Signed-off-by: Ingo Molnar Acked-by: Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66341a905ef5b3e7aea65b5d9bd1b0361b0ccc61 Author: Paul Mundt Date: Sun Nov 13 16:07:21 2005 -0800 [PATCH] Shut up per_cpu_ptr() on UP Currently per_cpu_ptr() doesn't really do anything with 'cpu' in the UP case. This is problematic in the cases where this is the only place the variable is referenced: CC kernel/workqueue.o kernel/workqueue.c: In function `current_is_keventd': kernel/workqueue.c:460: warning: unused variable `cpu' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f5c79f2920cbc21c718daeb0b12d69acf4de163 Author: Luiz Fernando Capitulino Date: Sun Nov 13 16:07:20 2005 -0800 [PATCH] Fix sparse warning in proc/task_mmu.c fs/proc/task_mmu.c:198:33: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ff1b2c8ceaf92197f756be569afefd593c56f68 Author: Paul Fulghum Date: Sun Nov 13 16:07:19 2005 -0800 [PATCH] synclink: update to use DMA mapping API Update synclink to use DMA mapping API. This removes warning about isa_virt_to_bus() usage on architectures other than i386 Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab4eb43ce759559d7b15c5dde4a1562f202539f6 Author: Denis Lunev Date: Sun Nov 13 16:07:17 2005 -0800 [PATCH] ext3: journal handling on error path in ext3_journalled_writepage() This patch fixes lost referrence on ext3 current handle in ext3_journalled_writepage(). Signed-Off-By: Denis Lunev Cc: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b17b0421d70f5b85a791afe145a16d5ca5f849aa Author: Heiko Carstens Date: Sun Nov 13 16:07:14 2005 -0800 [PATCH] signal handling: revert sigkill priority fix This patch reverts commit c33880aaddbbab1ccf36f4457ed1090621f2e39a since it's not needed anymore. As pointed out by Roland McGrath the real fix is to deliver all signals before returning to user space. See http://www.ussg.iu.edu/hypermail/linux/kernel/0509.2/0683.html A fix for s390 has been merged. Signed-off-by: Heiko Carstens Cc: Roland McGrath Cc: Ingo Molnar Cc: Linus Torvalds Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba260e23efbabcff975f60401475c2bdd693f872 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Nov 13 16:07:14 2005 -0800 [PATCH] uml: fix daemon transport exit path bug Fix some exit path bugs in the daemon driver. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a590611c0f1e1302c58fdfdc958f2d6bdddd78a Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Nov 13 16:07:13 2005 -0800 [PATCH] uml: fix access_ok The access_ok_tt() macro is bogus, in that a read access is unconditionally considered valid. I couldn't find in SCM logs the introduction of this check, but I went back to 2.4.20-1um and the definition was the same. Possibly this was done to avoid problems with missing set_fs() calls, but there can't be any I think because they would fail with SKAS mode. TT-specific code is still to check. Also, this patch joins common code together, and makes the "address range wrapping" check happen for all cases, rather than for only some. This may, possibly, be reoptimized at some time, but the current code doesn't seem clever, just confused. * Important: I've also had to change references to access_ok_{tt,skas} back to access_ok - the kernel wasn't that happy otherwise. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55c033c1f6cdedc350c79c3198b542e3ab496899 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Nov 13 16:07:11 2005 -0800 [PATCH] uml console channels: fix the API of console_write Since the 4th param is unused, remove it altogether. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd9bc53b99a77aefe89d810d889aa6385565959b Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Nov 13 16:07:10 2005 -0800 [PATCH] uml console channels: remove console_write wrappers We were using a long series of (stupid) wrappers which all call generic_console_write(). Since the wrappers only change the 4th param, which is unused by the called proc, remove them and call generic_console_write() directly. If needed at any time in the future to reintroduce this stuff, the member could be moved to a generic struct, to avoid this duplicated handling. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c50d2c4d6685db9b45cf6521046296df5bc42592 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Nov 13 16:07:07 2005 -0800 [PATCH] uml: fix mcast network driver error handling printk clears the host errno (I verified this in debugging and it's reasonable enough, given that it ends via a write call on some fd, especially since printk() goes on /dev/tty0 which is often the host stdout). So save errno earlier. There's no reason to change the printk calls to use -err rather than errno - the assignment can't clear errno. And in the first failure path, we used to return 0 too (and this time more clearly), which is totally wrong. 0 is a success fd, which is then registered and gives a "registering fd twice" warning. Finally, fix up some whitespace. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85977376c73b7712ed3618888ade126075888c06 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Nov 13 16:07:06 2005 -0800 [PATCH] uml: fixups for "reuse i386 cpu-specific tuning" A few fixups - show the new submenu only for x86 subarchitecture (it does not make sense to show it for x86_64 users) and remove X86_CMPXCHG, which is now a duplicate of Kconfig.i386, even though Kconfig doesn't complain (we also miss the dependency on !M386 CPU). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b8d108a6e7992a53e0736abefac1b2e07ce98de Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Nov 13 16:07:04 2005 -0800 [PATCH] uml: micro fixups to arch Kconfig Remove a stone-age comment (UM *does* have a MMU, i.e. the host), and fix a dependency (introduced in commit 02edeb586ae4cdd17778923674700edb732a4741) to do what was intended. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbc24afa82106b67df804cb434739e4382eecd9a Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Nov 13 16:07:04 2005 -0800 [PATCH] uml: remove bogus WARN_ON, triggerable harmlessly on a page fault race The below warning was added in place of pte_mkyoung(); if (is_write) pte_mkdirty(); In fact, if the PTE is not marked young/dirty, our dirty/accessed bit emulation would cause the TLB permission not to be changed, and so we'd loop, and given we don't support preemption yet, we'd busy-hang here. However, I've seen this warning trigger without crashes during a loop of concurrent kernel builds, at random times (i.e. like a race condition), and I realized that two concurrent faults on the same page, one on read and one on write, can trigger it. The read fault gets serviced and the PTE gets marked writable but clean (it's possible on a shared-writable mapping), while the generic code sees the PTE was already installed and returns without action. In this case, we'll see another fault and service it normally. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ab23c95a0b77d45dc764dd4aed48fe6e8906e59 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Nov 13 16:07:00 2005 -0800 [PATCH] Kbuild: index asm-$(SUBARCH) headers for UML In Uml, many definitions are borrowed from underlying subarch headers (with #include ). And it has become annoying to keep switching tag files all time, so by default index the underlying subarch headers too. Btw, it adds negligible space to the tags file (less than 1M surely, IIRC it was around 500k over 40M). Finally, preserve the ALLSOURCE_ARCHS command line option (I hope) - if it is set, it is used for headers too as before. But check my construct please, I didn't test this. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b66a1edb01b82269a668a478625765b1fa4936f Author: Roman Zippel Date: Sun Nov 13 16:06:59 2005 -0800 [PATCH] m68k: convert thread flags to use bit fields Remove task_work structure, use the standard thread flags functions and use shifts in entry.S to test the thread flags. Add a few local labels to entry.S to allow gas to generate short jumps. Finally it changes a number of inline functions in thread_info.h to macros to delay the current_thread_info() usage, which requires on m68k a structure (task_struct) not yet defined at this point. Signed-off-by: Roman Zippel Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abd03753bd1532c05eb13231569a5257b007e29c Author: Al Viro Date: Sun Nov 13 16:06:58 2005 -0800 [PATCH] m68k: m68k-specific thread_info changes a) added embedded thread_info [m68k processor.h] b) added missing symbols in asm-offsets.c c) task_thread_info() and friends in asm-m68k/thread_info.h d) made m68k thread_info.h included by m68k processor.h, not the other way round. Signed-off-by: Al Viro Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f037360f2ed111fe89a8f5cb6ba351f4e9934e53 Author: Al Viro Date: Sun Nov 13 16:06:57 2005 -0800 [PATCH] m68k: thread_info header cleanup a) in smp_lock.h #include of sched.h and spinlock.h moved under #ifdef CONFIG_LOCK_KERNEL. b) interrupt.h now explicitly pulls sched.h (not via smp_lock.h from hardirq.h as it used to) c) in three more places we need changes to compensate for (a) - one place in arch/sparc needs string.h now, hardirq.h needs forward declaration of task_struct and preempt.h needs direct include of thread_info.h. d) thread_info-related helpers in sched.h and thread_info.h put under ifndef __HAVE_THREAD_FUNCTIONS. Obviously safe. Signed-off-by: Al Viro Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10ebffde3d3916026974352b7900e44afe2b243f Author: Al Viro Date: Sun Nov 13 16:06:56 2005 -0800 [PATCH] m68k: introduce setup_thread_stack() and end_of_stack() encapsulates the rest of arch-dependent operations with thread_info access. Two new helpers - setup_thread_stack() and end_of_stack(). For normal case the former consists of copying thread_info of parent to new thread_info and the latter returns pointer immediately past the end of thread_info. Signed-off-by: Al Viro Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1261f54611ec4ad6a7ab7080f86747e3ac3685b Author: Al Viro Date: Sun Nov 13 16:06:55 2005 -0800 [PATCH] m68k: introduce task_thread_info new helper - task_thread_info(task). On platforms that have thread_info allocated separately (i.e. in default case) it simply returns task->thread_info. m68k wants (and for good reasons) to embed its thread_info into task_struct. So it will (in later patch) have task_thread_info() of its own. For now we just add a macro for generic case and convert existing instances of its body in core kernel to uses of new macro. Obviously safe - all normal architectures get the same preprocessor output they used to get. Signed-off-by: Al Viro Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7feacd53347c04aee789ba5d632eda0c3fc421c4 Author: Tim Mann Date: Sun Nov 13 16:06:54 2005 -0800 [PATCH] x86: fix cpu_khz with clock=pit Fix http://bugzilla.kernel.org/show_bug.cgi?id=5546 The cpu_khz global is not initialized and remains 0 if you boot with clock=pit, even if the processor does have a TSC. This may have bad ramifications since the variable is used in various places scattered around the kernel, though I didn't check them all to see if they can tolerate cpu_khz = 0. You can observe the problem by doing "cat /proc/cpuinfo"; the cpu MHz line says 0.000. The fix is trivial; call init_cpu_khz() from init_pit(), just as it's called from the timers/timer_foo.c:init_foo() for other values of foo. Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e27182088e607880713d9c286a3d92d861c280e4 Author: Jan Beulich Date: Sun Nov 13 16:06:52 2005 -0800 [PATCH] i386: NMI pointer comparison fix Instruction pointer comparisons for the NMI on debug stack check/fixup were incorrect. From: Jan Beulich Cc: "Eric W. Biederman" Cc: Zwane Mwaikambo Acked-by: "Seth, Rohit" Cc: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27d99f7ead8cd6d2231798bff0d4c38814afea22 Author: Adrian Bunk Date: Sun Nov 13 16:06:51 2005 -0800 [PATCH] arch/i386/mm/init.c: small cleanups This patch contains the following cleanups: - make a needlessly global function static - every file should include the headers containing the prototypes for it's global functions Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4694ca02d19f42f5fd0b62cc2d0c7d3e5a0eef47 Author: Andrew Morton Date: Sun Nov 13 16:06:50 2005 -0800 [PATCH] powerpc-xmon-build-fix arch/powerpc/xmon/xmon.c:525: error: syntax error before "xmon_irq" arch/powerpc/xmon/xmon.c:526: warning: return type defaults to `int' arch/powerpc/xmon/xmon.c: In function `xmon_irq': arch/powerpc/xmon/xmon.c:532: error: `IRQ_HANDLED' undeclared (first use in this function) arch/powerpc/xmon/xmon.c:532: error: (Each undeclared identifier is reported only once arch/powerpc/xmon/xmon.c:532: error: for each function it appears in.) Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 647422868e48c9abd8ab85ad2a7de9161170ec89 Author: Kumar Gala Date: Sun Nov 13 16:06:49 2005 -0800 [PATCH] ppc32: Add support for handling PCI interrupts on MPC834x PCI expansion card The MPC8349 PIBs system has a expansion board with 6 PCI slots. We needed to update the IDSEL interrupt mapping for it to work properly. However, only PCI1 is supported as the first revision of this expansion board doesn't function properly for PCI2. For the time being we have zero'd out the entries for the IDSELs related to PCI2. When a functioning expansion board exists we can fix the table. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fce260a6bf75080ef61408504add5618f90e41b Author: Olof Johansson Date: Sun Nov 13 16:06:48 2005 -0800 [PATCH] ppc: add support for new powerbooks Enablement patch for the new PowerBooks (late 2005 edition). This enables the ATA controller, Gigabit ethernet and basic AGP setup. Bluetooth works out-of-the box after running hid2hci. Still remaining is to get the touchpad to work, the simple change of just adding the new USB ids isn't enough. Signed-off-by: Olof Johansson Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50c85a19e7b3928b5b5188524c44ffcbacdd4e35 Author: Christoph Lameter Date: Sun Nov 13 16:06:47 2005 -0800 [PATCH] slab: remove alloc_pages() calls The slab allocator never uses alloc_pages since kmem_getpages() is always called with a valid nodeid. Remove the branch and the code from kmem_getpages() Signed-off-by: Christoph Lameter Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 065d41cb269e9debb18c6d5052e4de1088ae3d8f Author: Pekka Enberg Date: Sun Nov 13 16:06:46 2005 -0800 [PATCH] slab: convert cache to page mapping macros This patch converts object cache <-> page mapping macros to static inline functions to make the more explicit and readable. Signed-off-by: Pekka Enberg Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 669ed17521b9b78cdbeac8a53c30599aca9527ce Author: Nick Piggin Date: Sun Nov 13 16:06:45 2005 -0800 [PATCH] mm: highmem watermarks The pages_high - pages_low and pages_low - pages_min deltas are the asynch reclaim watermarks. As such, the should be in the same ratios as any other zone for highmem zones. It is the pages_min - 0 delta which is the PF_MEMALLOC reserve, and this is the region that isn't very useful for highmem. This patch ensures highmem systems have similar characteristics as non highmem ones with the same amount of memory, and also that highmem zones get similar reclaim pressures to other zones. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d6c666e8704cf06267f29a4fa3d2cf823469c38 Author: Paul Jackson Date: Sun Nov 13 16:06:44 2005 -0800 [PATCH] mm: gfp_noreclaim cleanup Remove last remnant of the defunct early reclaim page logic, the no longer used __GFP_NORECLAIM flag bit. Signed-off-by: Paul Jackson Acked-by: Martin Hicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fb1d9fca5c6e3b06773b69165a73f3fb786b8ee Author: Rohit Seth Date: Sun Nov 13 16:06:43 2005 -0800 [PATCH] mm: __alloc_pages cleanup Clean up of __alloc_pages. Restoration of previous behaviour, plus further cleanups by introducing an 'alloc_flags', removing the last of should_reclaim_zone. Signed-off-by: Rohit Seth Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51c6f666fceb3184eeff045dad4432b602cd648e Author: Robin Holt Date: Sun Nov 13 16:06:42 2005 -0800 [PATCH] mm: ZAP_BLOCK causes redundant work The address based work estimate for unmapping (for lockbreak) is and always was horribly inefficient for sparse mappings. The problem is most simply explained with an example: If we find a pgd is clear, we still have to call into unmap_page_range PGDIR_SIZE / ZAP_BLOCK_SIZE times, each time checking the clear pgd, in order to progress the working address to the next pgd. The fundamental way to solve the problem is to keep track of the end address we've processed and pass it back to the higher layers. From: Nick Piggin Modification to completely get away from address based work estimate and instead use an abstract count, with a very small cost for empty entries as opposed to present pages. On 2.6.14-git2, ppc64, and CONFIG_PREEMPT=y, mapping and unmapping 1TB of virtual address space takes 1.69s; with the following patch applied, this operation can be done 1000 times in less than 0.01s From: Andrew Morton With CONFIG_HUTETLB_PAGE=n: mm/memory.c: In function `unmap_vmas': mm/memory.c:779: warning: division by zero Due to zap_work -= (end - start) / (HPAGE_SIZE / PAGE_SIZE); So make the dummy HPAGE_SIZE non-zero Signed-off-by: Robin Holt Signed-off-by: Nick Piggin Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 885036d32f5d3c427c3e2b385b5a5503805e3e52 Author: Kirill Korotaev Date: Sun Nov 13 16:06:41 2005 -0800 [PATCH] mm: __GFP_NOFAIL fix In __alloc_pages(): if ((p->flags & (PF_MEMALLOC | PF_MEMDIE)) && !in_interrupt()) { /* go through the zonelist yet again, ignoring mins */ for (i = 0; zones[i] != NULL; i++) { struct zone *z = zones[i]; page = buffered_rmqueue(z, order, gfp_mask); if (page) { zone_statistics(zonelist, z); goto got_pg; } } goto nopage; <<<< HERE!!! FAIL... } kswapd (which has PF_MEMALLOC flag) can fail to allocate memory even when it allocates it with __GFP_NOFAIL flag. Signed-Off-By: Pavel Emelianov Signed-Off-By: Denis Lunev Signed-Off-By: Kirill Korotaev Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4d28dd4b12649d02a89d19e6bd12ab92a6fcd4e Author: Andrew Morton Date: Sun Nov 13 16:06:40 2005 -0800 [PATCH] shpchp_hpc build fix Missing include. Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d1b8c9ef6edbe5feea1439c428b9388b8dec6f8 Author: Andrew Morton Date: Sun Nov 13 16:06:39 2005 -0800 [PATCH] pciehp_hpc build fix drivers/pci/hotplug/pciehp_hpc.c:221: parse error before "pcie_isr" drivers/pci/hotplug/pciehp_hpc.c:221: warning: type defaults to `int' in declaration of `pcie_isr' drivers/pci/hotplug/pciehp_hpc.c:221: warning: data definition has no type or storage class drivers/pci/hotplug/pciehp_hpc.c: In function `hpc_release_ctlr': drivers/pci/hotplug/pciehp_hpc.c:715: implicit declaration of function `free_irq' drivers/pci/hotplug/pciehp_hpc.c: At top level: drivers/pci/hotplug/pciehp_hpc.c:839: parse error before "pcie_isr" drivers/pci/hotplug/pciehp_hpc.c:840: warning: return type defaults to `int' drivers/pci/hotplug/pciehp_hpc.c: In function `pcie_isr': drivers/pci/hotplug/pciehp_hpc.c:850: `IRQ_NONE' undeclared (first use in this function) drivers/pci/hotplug/pciehp_hpc.c:850: (Each undeclared identifier is reported only once drivers/pci/hotplug/pciehp_hpc.c:850: for each function it appears in.) drivers/pci/hotplug/pciehp_hpc.c:979: `IRQ_HANDLED' undeclared (first use in this function) drivers/pci/hotplug/pciehp_hpc.c: In function `pcie_init': drivers/pci/hotplug/pciehp_hpc.c:1362: implicit declaration of function `request_irq' Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afdd3b3c8ee63c662bafc9194c182610b254c59b Author: Richard Purdie Date: Sun Nov 13 16:06:38 2005 -0800 [PATCH] w100fb: platform device conversion fixup Fix an error in w100fb after the platform device conversion. Signed-off-by: Richard Purdie Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae7642bb05623988d8ca82b332dad1ed7bdb8ceb Author: Peter Osterlund Date: Sun Nov 13 16:06:36 2005 -0800 [PATCH] packet writing oops fix There is an old bug in the pkt_count_states() function that causes stack corruption. When compiling with gcc 3.x or 2.x it is harmless, but gcc 4 allocates local variables differently, which makes the bug visible. Signed-off-by: Peter Osterlund Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5563e77078d85c4f107a0a673500c43ce57cf702 Author: Bob Picco Date: Sun Nov 13 16:06:35 2005 -0800 [PATCH] cpuset: fix return without releasing semaphore It is wrong to acquire the semaphore and then return from cpuset_zone_allowed without releasing it. Signed-off-by: Bob Picco Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c8d61bcf2d762fb84dbf741df400c833cada18a Author: Antonino A. Daplas Date: Sun Nov 13 16:06:34 2005 -0800 [PATCH] nvidiafb: Fix bug in nvidiafb_pan_display nvidiafb_pan_display() is incorrectly using the fields in info->var instead of var passed to the function. Signed-off-by: Antonino Daplas Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89a071b80767c3a7ed56e13ae5e810f751b19eeb Author: akpm@osdl.org Date: Sun Nov 13 16:06:33 2005 -0800 [PATCH] rpaphp_pci build fix (akpm: _machine is some ppc64 thing - this is a powerpc-only driver) Signed-off-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 005f18dfd0ed86c39716277b61dfb4bd2af91059 Author: Christoph Hellwig Date: Sun Nov 13 16:06:33 2005 -0800 [PATCH] fix task_struct leak in ptrace When ptrace_attach fails we need to drop the task_struct reference. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab767201881fec073157986c314485ab26caa4a0 Author: Antonino A. Daplas Date: Sun Nov 13 16:06:32 2005 -0800 [PATCH] fbdev: fix module dependency loop Exporting struct fb_display produces this warning error on depmod: WARNING: Module /lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_ud.ko ignored, due to loop WARNING: Module /lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_rotate.ko ignored, due to loop WARNING: Module /lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_cw.ko ignored, due to loop WARNING: Module /lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_ccw.ko ignored, due to loop WARNING: Module /lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon.ko ignored, due to loop WARNING: Loop detected: /lib/modules/2.6.14-mm2/kernel/drivers/video/console/bitblit.ko needs Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c53ca784dc3e72a17dc210bee0361e13ad83d4cd Author: Andrew Morton Date: Sun Nov 13 16:06:31 2005 -0800 [PATCH] nv_of.c build fix drivers/video/nvidia/nv_of.c:33: error: redefinition of `nvidia_probe_of_connector' drivers/video/nvidia/nv_proto.h:51: error: `nvidia_probe_of_connector' previously defined here Because the inline version depends on !CONFIG_FB_OF and the out-of-line version depends on CONFIG_PPC_OF. Ben said: "Yes, CONFIG_PPC_OF is the right one, must be a typo." Cc: Benjamin Herrenschmidt C: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c8d3d997ef3c0594350fba716529905b314287e Author: Kumar Gala Date: Sun Nov 13 16:06:30 2005 -0800 [PATCH] Update email address for Kumar Changed jobs and the Freescale address is no longer valid. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1986ee9bea3d880bcf0d3f1a31e055778f306c7 Author: Harald Welte Date: Sun Nov 13 16:06:29 2005 -0800 [PATCH] New Omnikey Cardman 4000 driver Add new Omnikey Cardman 4000 smartcard reader driver Signed-off-by: Harald Welte Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77c44ab1d8e9da31bf927223e1579b44f772b579 Author: Harald Welte Date: Sun Nov 13 16:06:26 2005 -0800 [PATCH] New Omnikey Cardman 4040 driver Add new Omnikey Cardman 4040 smartcard reader driver Signed-off-by: Harald Welte Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bca73e4bf8563d83f7856164caa44d5f42e44cca Author: Jeff Garzik Date: Sun Nov 13 16:06:25 2005 -0800 [PATCH] move pm_register/etc. to CONFIG_PM_LEGACY, pm_legacy.h Since few people need the support anymore, this moves the legacy pm_xxx functions to CONFIG_PM_LEGACY, and include/linux/pm_legacy.h. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95e861db3eaba7bc99f8605db70103ec3d078203 Author: Eric Dumazet Date: Sun Nov 13 16:06:24 2005 -0800 [PATCH] reorder struct files_struct The file_lock spinlock sits close to mostly read fields of 'struct files_struct' In SMP (and NUMA) environments, each time a thread wants to open or close a file, it has to acquire the spinlock, thus invalidating the cache line containing this spinlock on other CPUS. So other threads doing read()/write()/... calls that use RCU to access the file table are going to ask further memory (possibly NUMA) transactions to read again this memory line. Move the spinlock to another cache line, so that concurrent threads can share the cache line containing 'count' and 'fdt' fields. It's worth up to 9% on a microbenchmark using a 4-thread 2-package x86 machine. See http://marc.theaimsgroup.com/?l=linux-kernel&m=112680448713342&w=2 Signed-off-by: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6c7ac081bf6cafcf780b919ee97978f1d01a0d7 Author: Karsten Wiese Date: Sun Nov 13 16:06:22 2005 -0800 [PATCH] x86_64 two timer entries in /sys attached patch renames one instance of /sys/devices/system/timer to /sys/devices/system/timer_pit to avoid a name clash with another instance created in time.c. Acked-by: Andi Kleen Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47936357c0d14809c3c9547e532511f6625654b2 Author: Siddha, Suresh B Date: Sun Nov 13 16:06:21 2005 -0800 [PATCH] x86_64: fix tss limit Fix the x86_64 TSS limit in TSS descriptor. Signed-off-by: Suresh Siddha Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9d39130123238ac18478a42e25cb7996eacfcc0 Author: Jeff Garzik Date: Sun Nov 13 17:47:51 2005 -0500 [libata sata_mv] fix tons of 50XX bugs commit dcc2d1e7f0acf7d3f7ae632a73cd5f828ef9de20 Author: Mark Lord Date: Sun Nov 13 16:22:06 2005 -0500 [libata passthru] address slave devices correctly commit e12a1be6e8fa47ae6cdc4127a1b4640e19c288eb Author: Mark Lord Date: Sat Nov 12 18:55:45 2005 -0500 [PATCH] libata: fix comments on ata_tf_from_fis() Fix description on comments for ata_tf_from_fis(). Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 5b9d1f19a7d6f13a97ac3eea9a1caea011ebd0ae Author: Thomas Gleixner Date: Sun Nov 13 19:33:24 2005 +0100 [JFFS2] Remove broken and useless debug code Signed-off-by: Thomas Gleixner commit ef63d0049a28008c133e83743681c66e8b0872be Author: Sean Young Date: Wed Nov 9 00:12:50 2005 +0000 [MTD] maps: Replace dependency on non existing config option CONFIG_ELAN doesn't exist any more; CONFIG_X86_ELAN is too specific so make ts-5500 memory map dependant on CONFIG_X86. Signed-off-by: Sean Young Signed-off-by: Thomas Gleixner commit f3a9388e4ebea57583272007311fffa26ebbb305 Author: Chris Wright Date: Fri Nov 11 17:20:14 2005 -0800 [PATCH] VFS: local denial-of-service with file leases Remove time_out_leases() printk that's easily triggered by users. Signed-off-by: Chris Wright Signed-off-by: Trond Myklebust commit dc15ae14e97ee9d5ed740cbb0b94996076d8b37e Author: J. Bruce Fields Date: Thu Nov 10 19:08:00 2005 -0500 [PATCH] VFS: Fix memory leak with file leases The patch http://linux.bkbits.net:8080/linux-2.6/diffs/fs/locks.c@1.70??nav=index.html introduced a pretty nasty memory leak in the lease code. When freeing the lease, the code in locks_delete_lock() will correctly clean up the fasync queue, but when we return to fcntl_setlease(), the freed fasync entry will be reinstated. This patch ensures that we skip the call to fasync_helper() when we're freeing up the lease. Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit e9c05afa80ba9368ec5f78d493b17a8f836ef508 Author: Tejun Heo Date: Mon Nov 14 00:24:18 2005 +0900 [PATCH] sil24: add missing ata_pad_free() sil24_port_stop() is missing call to ata_pad_free() thus leaking pad buffer when a port is stopped. This patch adds it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ee31b337852ca8a65840702544ff5c64d37740f5 Author: Russell King Date: Sun Nov 13 15:28:51 2005 +0000 [SERIAL] Fix Bug 4900: S3 resume oops with irattach - Thinkpad A21m If we fail to re-startup a serial port on resume, shut it down immediately and mark it as an error condition. Signed-off-by: Russell King commit bd5d080ab99642e3245ef7cfa54490384c01d878 Author: Richard Purdie Date: Sun Nov 13 10:07:48 2005 +0000 [ARM] 3160/1: SharpSL: Add driver for Akita specific GPIOs Patch from Richard Purdie Add a driver for the extra GPIOs found on the Sharp SL-C1000 (Akita). These GPIOs are found on a Maxim MAX7310 I2C i/o expander chip. A generic GPIO driver for the MAX7310 was attempted but this mini driver is a much simpler and much more effective solution avoiding several issues and complexity the generic driver had (as discussed on LKML). The platform device is required so the device parent can be set correctly which ensures the device is one of the last to suspend and first to resume. Whilst the i2c suspend/resume calls can be influenced, nothing guarantees this is easlier/later than the subsystems the gpios are used on which are all independent of i2c (sound, irda, video/backlight etc.). Signed-off-by: Richard Purdie Signed-off-by: Russell King commit e8b6f7f437a624fc2e2a2ec92fbeffdcf6f0e11e Author: Richard Purdie Date: Sun Nov 13 10:07:47 2005 +0000 [ARM] 3159/1: SharpSL: Add PM device driver for the SL-Cx00 machines. Patch from Richard Purdie Add a SharpSL PM device driver for the SL-Cxx00 machines. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit d72f25b0dfb0807bd758da56a7ed88c0eb6e70d8 Author: Richard Purdie Date: Sun Nov 13 10:07:46 2005 +0000 [ARM] 3158/1: SharpSL: Add PM device driver for the SL-C7x0 machines. Patch from Richard Purdie Add a SharpSL PM device driver for the SL-C7x0 machines. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 865052fd51a4f95a9c61961198695877ddc3dc9e Author: Russell King Date: Sun Nov 13 09:53:34 2005 +0000 [ARM] Re-fix footbridge That's __phys_to_pfn, not __phy_to_pfn. Signed-off-by: Russell King commit 2a47ce06d534692f9bd2bf4e90a20fc9b1054c39 Author: Jeff Garzik Date: Sat Nov 12 23:05:14 2005 -0500 [libata sata_mv] call phy fixups during init, as well as phy reset commit 101ffae26c23ea928fce6d31a8b4901327d91a15 Author: Jeff Garzik Date: Sat Nov 12 22:17:49 2005 -0500 [libata sata_mv] move code around No content changes. Move 60xx code to be closer to other 60xx code. commit 522479fb98c6667f081e75f87e298e413c0b1db8 Author: Jeff Garzik Date: Sat Nov 12 22:14:02 2005 -0500 [libata sata_mv] hardware initialization work Implement flash reset and PCI reset on 50xx and 60xx. Implement LED enable on 50xx. commit 47c2b677daeed9c79ecb7167c211ff36876ea611 Author: Jeff Garzik Date: Sat Nov 12 21:13:17 2005 -0500 [libata sata_mv] mv_hw_ops for hardware families; new errata - eliminate a bunch of redundant tests by creating a per-chip-family set of hooks, mv_hw_ops - implement more errata, from newer Marvell GPL'd driver commit ba3fe8fb6a469390a14379519915f3c39a973d99 Author: Jeff Garzik Date: Sat Nov 12 19:08:48 2005 -0500 [libata sata_mv] move code around No content change, just prepping up future mv_hw_ops modularization. commit 807277cbf9a240b133ee378a53b65375088ef62a Author: Dominik Brodowski Date: Sat Nov 12 23:34:06 2005 +0100 [PCMCIA] inform user of insertion and ejection events Print out minimal information in dmesg whnever a CardBus or PCMCIA card is inserted into or ejected from a slot. This will make debugging certain types of bugs much easier, and is similar to output produced by other hotpluggable buses. Signed-off-by: Dominik Brodowski commit 270c7a721548d116d9e054f48469e75cb0f35288 Author: Florin Malita Date: Sat Nov 12 22:09:22 2005 +0000 [SERIAL] sa1100_start_tx spinlock recursion The serial core aquires the port spinlock before calling port->ops->start_tx(), so sa1100_start_tx() shouldn't try to lock it again. BUG: spinlock recursion on CPU#0, init/1 lock: c0205f20, .magic: dead4ead, .owner: init/1, .owner_cpu: 0 [] (dump_stack+0x0/0x14) [] (spin_bug+0x0/0xbc) [] (_raw_spin_lock+0x0/0x170) r8 = 00000007 r7 = C02FE0070 [] (_spin_lock_irqsave+0x0/0x24) r4 = C0205F20 [] (sa1100_start_tx+0x0/0x40) r4 = C038C000 [] (__uart_start+0x0/0x5c) [] (uart_start+0x0/0x3 [] (uart_write+0x0/0xdc) [] (write_chan+0x0/0x370 Signed-off-by: Florin Malita Signed-off-by: Russell King commit fa609435a6edaaca14a646d470d7e10abebc8604 Author: Bjorn Helgaas Date: Sat Nov 12 22:06:31 2005 +0000 [SERIAL] Claim Wacom tablet device on HP tc1100 tablet Claim the WACF005 device. This is the pen display pointing device on the HP Compaq tc1100 Tablet PC. More information about using this device, including using it as an X pointer device: http://www.theory.bham.ac.uk/staff/schofield/linux/tc1100/ Christopher Kemp did the legwork of determining that the WACF005 is really just a plain old UART and doing an initial ACPI driver (before we had PNPACPI), and David Ludlow confirmed that PNPACPI + the attached patch is now sufficient: pnp: Device 00:05 activated. ttyS4 at I/O 0x300 (irq = 4) is a 16550A Signed-off-by: Bjorn Helgaas Signed-off-by: Russell King commit 38801e2e54308ec52fc580c0fcdee98fe8696195 Author: Andrey Volkov Date: Sat Nov 12 22:04:06 2005 +0000 [SERIAL] Fix mpc52xx_uart.c Fix copy-paste bug in mpc52xx_uart.c (pdev<->dev) Signed-off-by: Andrey Volkov Signed-off-by: Russell King commit 46677736bec5c44601987e8780e55bc242e0aa46 Author: Ralf Baechle Date: Sat Nov 12 22:00:27 2005 +0000 [SERIAL] dz: Use CKSEG1ADDR to setup mappings. Use physical addresses at the interface level, letting drivers remap them as appropriate. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle Signed-off-by: Russell King commit fd8c597214f868df7c0055c54e27baaae8df9e70 Author: Ralf Baechle Date: Sat Nov 12 21:59:59 2005 +0000 [SERIAL] dz: Nuke trailing whitespace Signed-off-by: Ralf Baechle Signed-off-by: Russell King commit 5c8c755ce508a9d41d8a8d80fff387cb4e2929fc Author: Lennert Buytenhek Date: Sat Nov 12 21:58:05 2005 +0000 [SERIAL] don't disable xscale serial ports after autoconfig xscale-type UARTs have an extra bit (UUE) in the IER register that has to be written as 1 to enable the UART. At the end of autoconfig() in drivers/serial/8250.c, the IER register is unconditionally written as zero, which turns off the UART, and makes any subsequent printch() hang the box. Since other 8250-type UARTs don't have this enable bit and are thus always 'enabled' in this sense, it can't hurt to enable xscale-type serial ports all the time as well. The attached patch changes the autoconfig() exit path to see if the port has an UUE enable bit, and if yes, to write UUE=1 instead of just putting a zero into IER, using the same test as is used at the beginning of serial8250_console_write(). Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 1cf99be560e471a868e14b12c08b0ae383966cec Author: Russell King Date: Sat Nov 12 21:49:36 2005 +0000 [ARM] Use correct IO operations for Pleb Use read/write IO operations rather than in/out, as per other SA1100 platforms. Signed-off-by: Russell King commit dfb279c97510da659816f4f055146bb1f9f0a870 Author: Dominik Brodowski Date: Thu Nov 10 16:26:13 2005 +0100 [PCMCIA] i82365: use new platform_device helpers Use the new platform_device helpers in the i82365 driver to get rid of the "device 'i823650' does not have a release() function" warning, and to solve bug #3676. Signed-off-by: Dominik Brodowski commit c35bf4a593631850ab437b37ddcded4e05548e9e Author: Pavel Machek Date: Sat Nov 12 20:25:25 2005 +0000 [ARM] Fix collie for -rc1 This fixes compilation for collie after -rc1 platform_device changes. And yes, it even boots. Signed-off-by: Pavel Machek Signed-off-by: Russell King commit 8225ccbaf01b459cf1e462047a51b2851e756bc1 Author: Thomas Graf Date: Sat Nov 12 12:15:16 2005 -0800 [IPV6]: Fix unnecessary GFP_ATOMIC allocation in fib6 dump Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit a2d7222f0f5861ce13b9308c30bd18f28ebeb583 Author: Vlad Drukker Date: Sat Nov 12 12:13:14 2005 -0800 [NETFILTER] {ip,nf}_conntrack TCP: Accept SYN+PUSH like SYN Some devices (e.g. Qlogic iSCSI HBA hardware like QLA4010 up to firmware 3.0.0.4) initiates TCP with SYN and PUSH flags set. The Linux TCP/IP stack deals fine with that, but the connection tracking code doesn't. This patch alters TCP connection tracking to accept SYN+PUSH as a valid flag combination. Signed-off-by: Vlad Drukker Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit efacfbcb6c88677809f44a574fbcd9824835dccb Author: Herbert Xu Date: Sat Nov 12 12:12:05 2005 -0800 [IPV6]: Fix rtnetlink dump infinite loop The recent change to netlink dump "done" callback handling broke IPv6 which played dirty tricks with the "done" callback. This causes an infinite loop during a dump. The following patch fixes it. This bug was reported by Jeff Garzik. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9ffb83bcc5c5337f980dc0576bf13ac9bd4fd33d Author: Christoph Hellwig Date: Sat Nov 12 12:11:12 2005 -0800 [SBUSFB]: implement ->compat_ioctl This patch adds a new function, sbusfb_compat_ioctl() to drivers/video/sbuslib.c and uses it as compat_ioctl in all sbus fb drivers This remove the last per-arch compat ioctl bits in arch/sparc64/kernel/ioctl32.c so it would be nice if people could test if this actually copiles and works and if yes apply it :) Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 535f8d65d808421a6e1730990e39d41885b1f951 Author: Christoph Hellwig Date: Sat Nov 12 12:10:54 2005 -0800 [SPARC]: Fix RTC compat ioctl kernel log spam. On Fri, Nov 11, 2005 at 12:58:40PM -0800, David S. Miller wrote: > > This change: > > diff-tree 8ca2bdc7a98b9584ac5f640761501405154171c7 (from feee207e44d3643d19e648aAuthor: Christoph Hellwig > Date: Wed Nov 9 12:07:18 2005 -0800 > > [SPARC] sbus rtc: implement ->compat_ioctl > > Signed-off-by: Christoph Hellwig > Signed-off-by: David S. Miller > > results in the console now getting spewed on sparc64 systems > with messages like: > > [ 11.968298] ioctl32(hwclock:464): Unknown cmd fd(3) cmd(401c7014){00} arg(efc > What's happening is hwclock tries first the SBUS rtc device ioctls > then the normal rtc driver ones. > > So things actually worked better when we had the SBUS rtc compat ioctl > directly handled via the generic compat ioctl code. > > There are _so_ many rtc drivers in the kernel implementing the > generic rtc ioctls that I don't think putting a ->compat_ioctl > into all of them to fix this problem is feasible. Unless we > write a single rtc_compat_ioctl(), export it to modules, and hook > it into all of those somehow. > > But even that doesn't appear to have any pretty implementation. > > Any better ideas? We had similar problems with other ioctls where userspace did things like that. What we did there was to put the compat handler to generic code. The patch below does that, adding a big comment about what's going on and removing the COMPAT_IOCTL entires for these on powerpc that not only weren't ever useful but are duplicated now aswell. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 4f005551a8fac21b6fec8d10d57cd12d373d79e1 Author: Dmitry Torokhov Date: Sat Nov 12 00:55:15 2005 -0500 [PATCH] I8K: fix /proc reporting of blank service tags Make /proc/i8k display '?' when service tag is blank in BIOS. This fixes segfault in i8k gkrellm plugin. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit c5e1ae9729d97d3c543cc70d7865df1e724da0d0 Author: Richard Purdie Date: Sat Nov 12 18:53:48 2005 +0000 [ARM] 3154/1: SharpSL PM Driver updates Patch from Richard Purdie Updates to the SharpSL PM driver including cleanups from both Pavel Machek and myself and updates after the platform device changes to make it compile again. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 94cabd003e989556d8bf84027d96284dc2d99c76 Author: Richard Purdie Date: Sat Nov 12 18:53:48 2005 +0000 [ARM] 3149/1: SharpSL: Add Akita (SL-C1000) machine support Patch from Richard Purdie Add the core machine support for the Sharp SL-C1000 (Akita) and enable the Kconfig selection for it. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 44e6f84e3597905816a0440e7218d2ed072120da Author: Prakash Punnoor Date: Sat Nov 12 09:17:38 2005 +0100 [PATCH] fix b2c2 dvb undefined symbol This fixes drivers/built-in.o: In function `flexcop_frontend_init': : undefined reference to `lgdt330x_attach' [ Side note: I really dislike that dvb people want to include every possible frontend into the kernel - I only need the mt312 one for my Skystar2 card. I'd highly appreciate it this would be made selectable again... ] Signed-off-by: Prakash Punnoor Signed-off-by: Linus Torvalds commit 0fde7f591860e48dd210144ff24c061da03bfa39 Author: Linus Torvalds Date: Sat Nov 12 10:14:02 2005 -0800 Revert "[PATCH] fbcon: Add rl (Roman Large) font" This reverts 998e6d51162707685336ff99c029c8911b270d32 commit. commit bca1c4eb9411533d613123618c0d127fae532595 Author: Jeff Garzik Date: Sat Nov 12 12:48:15 2005 -0500 [libata sata_mv] implement a bunch of errata workarounds Based largely on the GPL'd Marvell vendor driver. commit a1510210c45c9af5784d64596c7025997e1add7d Author: Russell King Date: Sat Nov 12 17:45:45 2005 +0000 [ARM] Ensure sl82c105 IDE interfaces are serialized when using DMA We don't want to reset the DMA state machine while the other channel is in use. Signed-off-by: Russell King commit 9a68c1b9580886a2ff07a42733adb7583ee3d9ac Author: Jeff Garzik Date: Sat Nov 12 12:40:41 2005 -0500 [libata sata_mv] note driver is "HIGHLY EXPERIMENTAL" in Kconfig commit 8b260248d9e0e8b64bb72fd4dee03ad86984c344 Author: Jeff Garzik Date: Sat Nov 12 12:32:50 2005 -0500 [libata sata_mv] trim trailing whitespace commit 69177e890cd43e781c3aa9eed98ea091c4cb0788 Author: Russell King Date: Sat Nov 12 17:26:21 2005 +0000 [MMC] mmci doesn't need asm/irq.h Signed-off-by: Russell King commit da2660d2c40496b1699c4de652f6d0cfd13937c0 Author: Russell King Date: Sat Nov 12 17:21:47 2005 +0000 [ARM] Restore apparant pointless change in arch/arm/kernel/smp.c Restore smp.c back to how it used to be. Signed-off-by: Russell King commit 9648f552f9e08548a3979643b99f14c21c7d8f5b Author: Russell King Date: Sat Nov 12 16:57:29 2005 +0000 [ARM] Fix broken sl82c105 DMA prevention We must _never_ _ever_ on pain of death enable IDE DMA on SL82C105 chipsets where the southbridge revision is <= 5, otherwise data corruption will occur. Strangely this used to work, but something has changed in the upper echelons of the IDE layer to break the hosts decision to deny DMA. Let's make it crystal clear to the IDE layer that we know best. Signed-off-by: Russell King commit 6460177f42358a744e110cc583adbe8a36f6aa08 Author: Russell King Date: Sat Nov 12 16:49:37 2005 +0000 [ARM] Fix Footbridge-based machines Unfortunately, all these machines got broken when the PFN memory setup changes happened. Signed-off-by: Russell King commit 095fec887eaa1c38d17c0c929a6733c744a9fa1f Author: Jeff Garzik Date: Sat Nov 12 09:50:49 2005 -0500 [libata sata_mv] minor fixes - clear SError and EDMA irq cause registers, after re-init'ing the phy - move enums with type suffix 'U' to their own enum commit 3beb2077125d8457118140653e75efc998ac6630 Author: Tejun Heo Date: Thu Nov 10 18:22:36 2005 +0100 [BLOCK] elevator: elv_latter/former_request update With generic dispatch queue update, implicit former/latter request handling using rq->queuelist.prev/next doesn't work as expected anymore. Also, the only iosched dependent on this feature was noop-iosched and it has been reimplemented to have its own latter/former methods. This patch removes implicit former/latter handling. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 5a7c47eefb31f6b4982add7473ef3e551b058ea4 Author: Tejun Heo Date: Thu Nov 10 18:21:30 2005 +0100 [BLOCK] noop-iosched: reimplementation of request dispatching The original implementation directly used dispatch queue. As new generic dispatch queue imposes stricter rules over ioscheds and dispatch queue usage, this direct use becomes somewhat problematic. This patch reimplements noop-iosched such that it complies to generic iosched model better. Request merging with q->last_merge and rq->queuelist.prev/next work again now. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe Date: Thu Nov 10 18:20:16 2005 +0100 [BLOCK] cfq-iosched: fix slice_left calculation When cfq slice expires, remainder of slice is calculated and stored in cfqq->slice_left. Current code calculates the opposite of remainder - how many jiffies the cfqq has used past slice end. This patch fixes the bug. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit be56123568072d223263a6a70a087d1e7faabb83 Author: Tejun Heo Date: Thu Nov 10 08:55:01 2005 +0100 [BLOCK] fix string handling in elv_iosched_store elv_iosched_store doesn't terminate string passed from userspace if it's too long. Also, if the written length is zero (probably not possible), it accesses elevator_name[-1]. This patch fixes both bugs. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 15853af9f07673680439b224519c692f1352b959 Author: Tejun Heo Date: Thu Nov 10 08:52:05 2005 +0100 [BLOCK] Implement elv_drain_elevator for improved switch error detection This patch adds request_queue->nr_sorted which keeps the number of requests in the iosched and implement elv_drain_elevator which performs forced dispatching. elv_drain_elevator checks whether iosched actually dispatches all requests it has and prints error message if it doesn't. As buggy forced dispatching can result in wrong barrier operations, I think this extra check is worthwhile. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 1b5ed5e1f1315e37380e55102f58bcae3344d2a7 Author: Tejun Heo Date: Thu Nov 10 08:49:19 2005 +0100 [BLOCK] cfq-iosched: cfq forced dispatching fix cfq forced dispatching might not return all requests on the queue. This bug can hang elevator switchinig and corrupt request ordering during flush sequence. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 407df2aa29a33fe16f6ee4bac8cdfa414783b9f1 Author: Tejun Heo Date: Thu Nov 10 08:48:21 2005 +0100 [BLOCK] elevator: run queue in elevator_switch elevator_dispatch needs to run queue after forced dispatching; otherwise, the queue might stall. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 47a004103d663bbba8c7c433a710a86f44351cf3 Author: Jens Axboe Date: Wed Nov 9 13:38:47 2005 +0100 [BLOCK] Document the READ/WRITE splitup of the disk stats Use the symbolic name where appropriate and add a comment to the disk_stats structure. Signed-off-by: Jens Axboe commit cff3ba2204a0797b05150a4b2b7f40a55023d952 Author: Zachary Amsden Date: Wed Nov 9 13:24:20 2005 +0100 [BLOCK] elevator init fixes #2 In addition to the first patch, which is probably goodness, I found the cause of my panic - applying this patch fixes it and now I am booting. If the chosen_elevator[] is not found, fall back to noop. Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit b8ea2cb5120a92fe63053a2896be42abbb919a76 Author: Zachary Amsden Date: Wed Nov 9 13:23:01 2005 +0100 [BLOCK] elevator init fixes I got a panic in the elevator code, backtrace : Unable to handle kernel NULL pointer dereference at virtual address 00000060 .. EIP is at elevator_put+0x0/0x30 (null elevator_type passed) .. elevator_init+0x38 blk_init_queu_node+0xc9 floppy_init+0xdb do_initcalls+0x23 init+0x10a init+0x0 Clearly if the kmalloc here fails, e->elevator_type is not yet set; this appears to be the correct fix, but I think I probably hit the second case due to a race condition. Someone more familiar with the elevator code should look at this more closely until I can determine if I can reproduce. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit 02eaa66629a29cd5712fe81a360c3ab5b1fc9531 Author: Jeff Garzik Date: Sat Nov 12 01:32:19 2005 -0500 [libata ahci] set port ATAPI bit correctly Although according to the documentation this largely only affects desktop LED control, let's make sure we set the ATAPI bit when we have an ATAPI device attached to the port. commit 828d09de4a6c922517f533093583b9fe8cbf5808 Author: Jeff Garzik Date: Sat Nov 12 01:27:07 2005 -0500 [libata ahci, qstor] fix miscount of scatter/gather entries Don't directly reference qc->n_elem, as that might cause an off-by-one error for misaligned (padded) ATAPI transfers. commit 5f068992a1bccda5574b4f6d33458ef806686d7f Author: Roland Dreier Date: Fri Nov 11 14:06:01 2005 -0800 [IB] srp: increase max_luns Increase SRP max_luns to 512 to match the kernel's default, since SRP storage targets can have lots of LUNs and the SRP initiator itself doesn't have any particular limit. Signed-off-by: Roland Dreier