commit 1c9426e8a59461688bb451e006456987b198e4c0 Author: Linus Torvalds Date: Fri Sep 30 14:17:35 2005 -0700 Linux v2.6.14-rc3 commit 85cc5135ace4c8b75d7b4e1ea9fe15a7fcbd1516 Author: Ravikiran G Thirumalai Date: Fri Sep 30 11:59:22 2005 -0700 [PATCH] x86_64 early numa init fix The tests Alok carried out on Petr's box confirmed that cpu_to_node[BP] is not setup early enough by numa_init_array due to the x86_64 changes in 2.6.14-rc*, and unfortunately set wrongly by the work around code in numa_init_array(). cpu_to_node[0] gets set with 1 early and later gets set properly to 0 during identify_cpu() when all cpus are brought up, but confusing the numa slab in the process. Here is a quick fix for this. The right fix obviously is to have cpu_to_node[bsp] setup early for numa_init_array(). The following patch will fix the problem now, and the code can stay on even when cpu_to_node{BP] gets fixed early correctly. Thanks to Petr for access to his box. Signed off by: Ravikiran Thirumalai Signed-off-by: Alok N Kataria Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6a045a5b89037ae87c8c1bc84403f1d498e52a1 Author: Ravikiran G Thirumalai Date: Fri Sep 30 11:59:21 2005 -0700 [PATCH] x86_64: fix the BP node_to_cpumask Fix the BP node_to_cpumask. 2.6.14-rc* broke the boot cpu bit as the cpu_to_node(0) is now not setup early enough for numa_init_array. cpu_to_node[] is setup much later at srat_detect_node on acpi srat based em64t machines. This seems like a problem on amd machines too, Tested on em64t though. /sys/devices/system/node/node0/cpumap shows up sanely after this patch. Signed off by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dd960d66bc12b6b206e63104636514e5da0ddb7 Author: Zhang, Yanmin Date: Fri Sep 30 11:59:20 2005 -0700 [PATCH] utilization of kprobe_mutex is incorrect on x86_64 The up()/down() orders are incorrect in arch/x86_64/kprobes.c file. kprobe_mutext is used to protect the free kprobe instruction slot list. arch_prepare_kprobe applies for a slot from the free list, and arch_remove_kprobe returns a slot to the free list. The incorrect up()/down() orders to operate on kprobe_mutex fail to protect the free list. If 2 threads try to get/return kprobe instruction slot at the same time, the free slot list might be broken, or a free slot might be applied by 2 threads. Signed-off-by: Zhang Yanmin Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32e7a04faa29f50f65e06d43a9029bb607743e76 Author: Jody McIntyre Date: Fri Sep 30 11:59:19 2005 -0700 [PATCH] ohci1394: less noise in dmesg less noise in dmesg Signed-off-by: Ben Collins Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f31c9cf3bd6bc1f3e29807ba59d0c7d711385a06 Author: Jody McIntyre Date: Fri Sep 30 11:59:18 2005 -0700 [PATCH] ieee1394: delete legacy module aliases amdtp, dv1394, raw1394, video1394: Delete legacy module aliases. The macros did not work and the aliases are not needed nowadays. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ae3d0d4ae4131563d9eb55859f4fa5bd39059bd Author: Jody McIntyre Date: Fri Sep 30 11:59:18 2005 -0700 [PATCH] eth1394: workaround limitation in rawiso routines Work around limitation in rawiso routines. Required with 1394b cards on architectures where PAGE_SIZE is 4096. Based on a previous patch by Ben Collins. Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 998150c3d3cf049da7596875f6fdc253db089a9a Author: Jody McIntyre Date: Fri Sep 30 11:59:17 2005 -0700 [PATCH] ieee1394: remove superfluous include in csr1212 Remove superfluous include. Signed-off-by: Jody McIntyre Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3256cc13983da2cfe45c17788e4f5b379695404e Author: Jody McIntyre Date: Fri Sep 30 11:59:16 2005 -0700 [PATCH] ieee1394: trivial edits of a few comments trivial edits of a few comments Signed-off-by: Stefan Richter Signed-off-by: Ben Collins Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63bea35036540c0e8a309aef9bc37a9acfb520ae Author: Jody McIntyre Date: Fri Sep 30 11:59:10 2005 -0700 [PATCH] ieee1394: use time_before() Use of time_before() macro, defined at linux/jiffies.h, which deal with wrapping correctly and are nicer to read. Signed-off-by: Marcelo Feitoza Parisi Signed-off-by: Domen Puncer Signed-off-by: Ben Collins Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db2fd664f8ac3664dfd94d624c0a871bee937bd5 Author: Jody McIntyre Date: Fri Sep 30 11:59:09 2005 -0700 [PATCH] ieee1394: fix for debug output Fix debug code so it prints the correct speed (was defaulting to 100, so anything > 400 showed only 100). Signed-off-by: Stefan Richter Signed-off-by: Ben Collins Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e31a127c2f99b9cb9abc99a1ec22b75194890800 Author: Jody McIntyre Date: Fri Sep 30 11:59:09 2005 -0700 [PATCH] ieee1394: skip unnecessary pause when scanning config ROMs Skip a superfluous pause that occured when the config ROM of a node was scanned unsuccessfully. This also occurs if a node without link wrongly enables its "link active" self ID flag. A GWCTech 6-port hub does this. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 328699bf0ff4d35a9932ce279441f955e78a890e Author: Jody McIntyre Date: Fri Sep 30 11:59:08 2005 -0700 [PATCH] ieee1394: reorder activities after bus reset (fixes device detection) Units were not detected if the local IRM performed a bus reset. ("The root node is not cycle master capable; selecting a new root node and resetting...", often seen with iPods and other SBP-2 devices). Rearrange the order of IRM duties and node scanning. TODO: Audit the ROM caching and parsing code for underlying issues. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2bab359a5009f330b12a4ed09a57d3d2ac6b3483 Author: Jody McIntyre Date: Fri Sep 30 11:59:07 2005 -0700 [PATCH] sbp2: default to serialize_io=1 Set serialize_io=1 by default. This is safer and required by seemingly more and more hardware. It causes little or no performance loss for S400 devices. Performance of S800 1394b devices may drop by 25...30%. Therefore make the parameter's description and dmesg message clearer about performance impact. Update description of the max_speed parameter too. IEEE1394_SPEED_MAX is currently S800. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abd559b1052e28d8b9c28aabde241f18fa89090b Author: Jody McIntyre Date: Fri Sep 30 11:59:06 2005 -0700 [PATCH] sbp2: fix deadlocks and delays on device removal/rmmod Fixes for deadlocks of the ieee1394 and scsi subsystems and long delays in futile error recovery attempts when SBP-2 devices are removed or drivers are unloaded. - Complete commands quickly with DID_NO_CONNECT if the 1394 node is gone or if the 1394 low-level driver was unloaded. - Skip unnecessary work in the eh_abort_handler and eh_device_reset_handler if the node or 1394 low-level driver is gone. - Let scsi's high-level shut down gracefully when sbp2 is being unloaded or detached from the 1394 unit. A call to scsi_remove_device is added for this purpose, which requires us to store a scsi_device pointer. - scsi_device pointer is obtained from slave_alloc hook and cleared by slave_destroy. This avoids usage of the pointer after the scsi device was deleted e.g. by the user via scsi_mod's sysfs interface. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 105d7b38b08f85c9abc3fd31e5cfa7ee4cf0a402 Author: Jody McIntyre Date: Fri Sep 30 11:59:04 2005 -0700 [PATCH] MAINTAINERS: sbp2 driver is not orphaned. Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d38e24e260daf11365efd4ed621235fe9c0ba7ee Author: Brent Casavant Date: Fri Sep 30 11:59:04 2005 -0700 [PATCH] ioc4_serial: Remove bogus error message This change removes a bogus error message from the IOC4 serial driver interrupt handler. This error message is bogus for two reasons. First, it can never occur given that current code takes care to initialize IOC4 in such a way that these "unknown" interrupts could never occur. Second, this code fails to take into account that other drivers can share the IOC4 interrupt mechanism through SA_SHIRQ, and thus this driver is not in-fact "all-knowing". Finally, this error message triggers every time some "unknown" interrupt occurs -- it's not rate limited or repetition limited in any way, thereby effectively denying use of the console device. Given its bogosity in the first place, it's best to just get rid of it entirely. Acked-by: Pat Gefre Signed-off-by: Brent Casavant Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd190d066b7ded8c44b2b67dd0a14bed01525d3c Author: Miklos Szeredi Date: Fri Sep 30 11:59:02 2005 -0700 [PATCH] fuse: check O_DIRECT Check O_DIRECT and return -EINVAL error in open. dentry_open() also checks this but only after the open method is called. This patch optimizes away the unnecessary upcalls in this case. It could be a correctness issue too: if filesystem has open() with side effect, then it should fail before doing the open, not after. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daa35edc0a967d1f77c2e2c1346f57d04371487a Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Sep 30 11:59:01 2005 -0700 [PATCH] uml: remove empty hostfs_truncate method Calling truncate() on hostfs spits a kernel warning "Something isn't implemented here", but it still works fine. Indeed, hostfs i_op->truncate doesn't do anything. But hostfs_setattr() -> set_attr() correctly detects ATTR_SIZE and calls truncate() on the host. So we should be safe (using ftruncate() may be better, in case the file is unlinked on the host, but we aren't sure to have the file open for writing, and reopening it would cause the same races; plus nobody should expect UML to be so careful). So, the warning is wrong, because the current implementation is working. Al, am I correct, and can the warning be therefore dropped? CC: Al Viro Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd948057357db5febfe64cf7a9ef11d7e347ffec Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Sep 30 11:59:00 2005 -0700 [PATCH] uml: revert "run mconsole "sysrq" in process context" Revert commit 12ebcd73e40e09f0dfddf89e465cc0541e0ff8b1, i.e. [PATCH] uml: run mconsole "sysrq" in process context on request from Jeff Dike. a) sysrq may be run when the scheduler is non-functioning b) the warning I wanted to fix actually came from the fault handler run in atomic context. But I fixed that not to take the semaphore in a separate patch. c) the fault handler is run because of a fault, and that fault was unaffected by this patch. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8923648c125421b0fcb240cde607e2748d099ab8 Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Sep 30 11:59:00 2005 -0700 [PATCH] uml: clear SKAS0/3 flags when running in TT mode SEGV_MAYBE_FIXABLE tests ptrace_faultinfo, and depends on it being 1 only in SKAS3 mode, while currently when running with mode=tt it will be 1 anyway. Fix this, and do the same for proc_mm. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be662a18b7763496a052d489206af9ca2c2e1ac2 Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Sep 30 11:58:59 2005 -0700 [PATCH] uml: fix page faults in SKAS3 mode. I hadn't been running a SKAS3 host when testing the "uml: fix hang in TT mode on fault" patch (commit 546fe1cbf91d4d62e3849517c31a2327c992e5c5), and I didn't think enough to the missing trap_no in SKAS3 mode. In fact, the resulting kernel doesn't work at all in SKAS3 mode. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79dfa4a5a2eea5035de793b1633031750fe8d3ff Author: Michael Krufky Date: Fri Sep 30 11:58:58 2005 -0700 [PATCH] v4l: DViCO FusionHDTV5 Lite GPIO Fix GPIO fix for the composite and tv mute states of bt8xx card #135: DViCO FusionHDTV5 Lite. Without this patch, selecting one of these states could produce unexpected behavior. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d96c4e7bb039ae16c9b7e6809feb4fcfc45fcc87 Author: Andrew Morton Date: Fri Sep 30 11:58:57 2005 -0700 [PATCH] x86: hw_irq.h warning fix include/asm/hw_irq.h:70: warning: `struct hw_interrupt_type' declared inside parameter list include/asm/hw_irq.h:70: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 353fb07e2043d2df12dddf4e2c39552d0ab9b026 Author: Zach Brown Date: Fri Sep 30 11:58:56 2005 -0700 [PATCH] aio: avoid extra aio_{read,write} call when ki_left == 0 Recently aio_p{read,write} changed to perform retries internally rather than returning -EIOCBRETRY. This inadvertantly resulted in always calling aio_{read,write} with ki_left at 0 which would in turn immediately return 0. Harmless, but we can avoid this call by checking in the caller. Signed-off-by: Zach Brown Signed-off-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 897f15fb587fd2772b9e7ff6ec0265057f3c3975 Author: Zach Brown Date: Fri Sep 30 11:58:55 2005 -0700 [PATCH] aio: remove unlocked task_list test and resulting race Only one of the run or kick path is supposed to put an iocb on the run list. If both of them do it than one of them can end up referencing a freed iocb. The kick path could delete the task_list item from the wait queue before getting the ctx_lock and putting the iocb on the run list. The run path was testing the task_list item outside the lock so that it could catch ki_retry methods that return -EIOCBRETRY *without* putting the iocb on a wait queue and promising to call kick_iocb. This unlocked check could then race with the kick path to cause both to try and put the iocb on the run list. The patch stops the run path from testing task_list by requring that any ki_retry that returns -EIOCBRETRY *must* guarantee that kick_iocb() will be called in the future. aio_p{read,write}, the only in-tree -EIOCBRETRY users, are updated. Signed-off-by: Zach Brown Signed-off-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 998765e5588b197737d457e16f72832d8036190f Author: Zach Brown Date: Fri Sep 30 11:58:54 2005 -0700 [PATCH] aio: lock around kiocbTryKick() Only one of the run or kick path is supposed to put an iocb on the run list. If both of them do it than one of them can end up referencing a freed iocb. The kick patch could set the Kicked bit before acquiring the ctx_lock and putting the iocb on the run list. The run path, while holding the ctx_lock, could see this partial kick and mistake it for a kick that was deferred while it was doing work with the run_list NULLed out. It would then race with the kick thread to add the iocb to the run list. This patch moves the kick setting under the ctx_lock so that only one of the kick or run path queues the iocb on the run list, as intended. Signed-off-by: Zach Brown Signed-off-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e3254c4e2927c117044a02acf5f5b56e1373053 Author: Linus Torvalds Date: Fri Sep 30 12:38:27 2005 -0700 Revert "x86-64: Reverse order of bootmem lists" As requested by Thomas Gleixner : "5d3d0f7704ed0bc7eaca0501eeae3e5da1ea6c87 breaks a couple of ARM boards, which depend on the historical bootmem allocation order. There is a cleaner solution around to remove the pgdat list completely, but this is a topic for post 2.6.14 Andi signalled ACK already." Signed-off-by: Linus Torvalds commit 13402580021a52e49c6d1068ff28ade4d5a175f1 Author: James Morris Date: Fri Sep 30 14:24:34 2005 -0400 [PATCH] SELinux - fix SCTP socket bug and general IP protocol handling The following patch updates the way SELinux classifies and handles IP based protocols. Currently, IP sockets are classified by SELinux as being either TCP, UDP or 'Raw', the latter being a default for IP socket that is not TCP or UDP. The classification code is out of date and uses only the socket type parameter to socket(2) to determine the class of IP socket. So, any socket created with SOCK_STREAM will be classified by SELinux as TCP, and SOCK_DGRAM as UDP. Also, other socket types such as SOCK_SEQPACKET and SOCK_DCCP are currently ignored by SELinux, which classifies them as generic sockets, which means they don't even get basic IP level checking. This patch changes the SELinux IP socket classification logic, so that only an IPPROTO_IP protocol value passed to socket(2) classify the socket as TCP or UDP. The patch also drops the check for SOCK_RAW and converts it into a default, so that socket types like SOCK_DCCP and SOCK_SEQPACKET are classified as SECCLASS_RAWIP_SOCKET (instead of generic sockets). Note that protocol-specific support for SCTP, DCCP etc. is not addressed here, we're just getting these protocols checked at the IP layer. This fixes a reported problem where SCTP sockets were being recognized as generic SELinux sockets yet still being passed in one case to an IP level check, which then fails for generic sockets. It will also fix bugs where any SOCK_STREAM socket is classified as TCP or any SOCK_DGRAM socket is classified as UDP. This patch also unifies the way IP sockets classes are determined in selinux_socket_bind(), so we use the already calculated value instead of trying to recalculate it. Signed-off-by: James Morris Signed-off-by: Stephen Smalley Signed-off-by: Linus Torvalds commit b33fa1f3c3ec05e54e73f06c4578948c55d89ef6 Author: Nick Piggin Date: Sat Oct 1 02:34:42 2005 +1000 [PATCH] i386: include linux/irq.h rather than asm/hw_irq.h I need the following patch to compile -git8 here, otherwise these files fail to compile (asm/hw_irq.h needs definitions from linux/irq.h and that file provides the required include ordering). I did not do a full audit, though there looks to be many other places that should get the same treatment, if this is the right way to do it. Signed-off-by: Linus Torvalds commit 03cdc0c304e1c068d49adc32264f07af76253e4c Author: Daniel Ritz Date: Thu Sep 29 21:39:32 2005 +0200 [PATCH] usb/core/hcd-pci.c: don't free_irq() on suspend the free_irq() in USB suspend breaks resume on some setups where USB (ohci/ehci) shares the interrupt with an other device. Signed-off-by: Daniel Ritz Signed-off-by: Linus Torvalds commit 1294b118cb53fb14515666e2b218ad5ab40318c1 Author: Kirill Korotaev Date: Fri Sep 30 10:32:19 2005 +0400 [PATCH] x86_64: Add missing () around arguments of pte_index macro x86-64: Add missing () around arguments of pte_index macro Signed-Off-By: Alexey Kuznetsov Signed-Off-By: Kirill Korotaev Signed-off-by: Linus Torvalds commit 794fb8370db3d5f26592b9b45d69aeca2f583efb Author: Al Viro Date: Fri Sep 30 05:09:34 2005 +0100 [PATCH] useless includes of linux/irq.h (arch/ppc) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a3ca066efb18524bf3f07137a8f8ff434022c4f2 Author: Al Viro Date: Fri Sep 30 04:20:57 2005 +0100 [PATCH] missing qualifiers in readb() et.al. on ppc Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 66df3bbf0701b7408a1067c4b819aceee2686bba Author: Al Viro Date: Fri Sep 30 04:19:43 2005 +0100 [PATCH] volatile unsigned short f(...) doesn't make sense Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c215a16a4ad620b612b51495cbb99dbbb59bb585 Author: Al Viro Date: Fri Sep 30 03:36:50 2005 +0100 [PATCH] bogus BUILD_BUG_ON() in bpa_iommu BUILD_BUG_ON(1) is asking for trouble (and getting it) when used in that manner - dead code elimination happens after we parse it and invalid type is invalid type, dead code or not. It might be version-dependent, but at least 4.0.1 refuses to accept that. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4735885701d7c24ed54f35f5102d32b3aabee55e Author: Al Viro Date: Fri Sep 30 03:29:05 2005 +0100 [PATCH] uml get_user() NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit eacaa1f5aa4a41a48349f55abcd9258506943e76 Author: Al Viro Date: Fri Sep 30 03:26:43 2005 +0100 [PATCH] cpuset crapectomy Switched cpuset_common_file_read() to simple_read_from_buffer(), killed a bunch of useless (and not quite correct - e.g. min(size_t,ssize_t)) code. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 46d7031ecb8a8360b0022abd8014f38cc1197166 Author: Al Viro Date: Fri Sep 30 03:21:45 2005 +0100 [PATCH] cassini annotations and fixes - __user annotations - NULL noise removal - C99 initializers - s/u32/pm_message_t/ in ->suspend() - removal of bogus casts in iounmap() arguments - if_mii() instead of open-coded variant Remains to be done: ethtool conversion. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 74ba1fd96666170338dc732480b35b7a83cd164b Author: Al Viro Date: Fri Sep 30 03:16:43 2005 +0100 [PATCH] useless linux/irq.h includes (arch/um) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 192eaa28ba7b44485e521df7ba7a2ccbc4cc4d13 Author: Al Viro Date: Fri Sep 30 03:15:08 2005 +0100 [PATCH] missing ERR_PTR in 9fs Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 217874feed0d3a6543a6b7127782f4a08bffd731 Author: Gen FUKATSU Date: Fri Sep 30 16:09:17 2005 +0100 [ARM] 2940/1: Fix BTB entry flush in arch/arm/mm/cache-v6.S Patch from Gen FUKATSU Invalidate BTB entry instruction flushes two instruction at a time. Therefore this instruction should be done four times after invalidate instruction cache line. Signed-off-by: Gen Fukatsu Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit a06f5466c4576dcbf838a50a87903b0082774da7 Author: Catalin Marinas Date: Fri Sep 30 16:07:05 2005 +0100 [ARM] 2942/1: Fix the warning in arch/arm/common/gic.c Patch from Catalin Marinas The warning is caused by the gic_set_cpu() function being defined but not used if CONFIG_SMP is not defined. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 481467d6fa4489aa42321a067e78bad26349488f Author: Catalin Marinas Date: Fri Sep 30 16:07:04 2005 +0100 [ARM] 2939/1: Fix compilation error in arch/arm/mm/flush.c Patch from Catalin Marinas When CONFIG_CPU_CACHE_VIPT is defined, the flush_pfn_alias() function is implicitely declared and it later conflicts with its actual definition. This patch moves the function definition to the beginning of the file. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit a4199b0b9aa540a27935251de788cd0f5f5a87aa Author: Al Viro Date: Thu Sep 29 19:49:17 2005 -0700 [CASSINI]: sparse annotations and fixes - __user annotations - NULL noise removal - C99 initializers - s/u32/pm_message_t/ in ->suspend() - removal of bogus casts in iounmap() arguments - if_mii() instead of open-coded variant Remains to be done: ethtool conversion. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 9d30c1718b8baf9a3bb1b81d78afc1e667863477 Author: Horms Date: Thu Sep 29 19:47:06 2005 -0700 [IPVS]: Add netdev and me as maintainer contacts Signed-off-by: Horms Signed-off-by: David S. Miller commit 017fb98e70351e9fb5635c299c4d1c50e2f8b823 Author: David S. Miller Date: Thu Sep 29 19:26:51 2005 -0700 [RADEON]: Fix unaligned I/O port access during probe. The driver does a readl() on DEVICE_ID which is 2-byte aligned and 2-bytes in size. It's doing this read just to flush write buffers. Create IN16() and OUT16() macros, and use the former to do this I/O load. Signed-off-by: David S. Miller commit 717463d806a53380a691eeb0136a4b750a9f9ae0 Author: David S. Miller Date: Thu Sep 29 18:50:34 2005 -0700 [SPARC64]: Fix several bugs in flush_ptrace_access(). 1) Use cpudata cache line sizes, not magic constants. 2) Align start address in cheetah case so we do not get unaligned address traps. (pgrep was good at triggering this, via /proc/${pid}/cmdline accesses) Signed-off-by: David S. Miller commit 4cb29d18129fb425c6202ab535c3fc1856391b99 Author: David S. Miller Date: Thu Sep 29 18:05:28 2005 -0700 [SPARC64]: Kill arch/sparc64/prom/memory.c No longer used. Signed-off-by: David S. Miller commit 13edad7a5cef1c952459742482482a6b05e1a8a1 Author: David S. Miller Date: Thu Sep 29 17:58:26 2005 -0700 [SPARC64]: Rewrite convoluted physical memory probing. Delete all of the code working with sp_banks[] and replace with clean acquisition and sorting of physical memory parameters from the firmware. Signed-off-by: David S. Miller commit 75b895c15b3ea2a3cd5c8e8f3c62e4598ef4d2ba Author: Scott Talbert Date: Thu Sep 29 17:31:30 2005 -0700 [ATM]: [lec] reset retry counter when new arp issued From: Scott Talbert Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 4a7097fcc431ab2ccf509d8342831873138c814a Author: Scott Talbert Date: Thu Sep 29 17:30:54 2005 -0700 [ATM]: [lec] attempt to support cisco failover From: Scott Talbert Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 09e9ec87111ba818d8171262b15ba4c357eb1d27 Author: Alexey Kuznetsov Date: Thu Sep 29 17:17:15 2005 -0700 [TCP]: Don't over-clamp window in tcp_clamp_window() From: Alexey Kuznetsov Handle better the case where the sender sends full sized frames initially, then moves to a mode where it trickles out small amounts of data at a time. This known problem is even mentioned in the comments above tcp_grow_window() in tcp_input.c, specifically: ... * The scheme does not work when sender sends good segments opening * window and then starts to feed us spagetti. But it should work * in common situations. Otherwise, we have to rely on queue collapsing. ... When the sender gives full sized frames, the "struct sk_buff" overhead from each packet is small. So we'll advertize a larger window. If the sender moves to a mode where small segments are sent, this ratio becomes tilted to the other extreme and we start overrunning the socket buffer space. tcp_clamp_window() tries to address this, but it's clamping of tp->window_clamp is a wee bit too aggressive for this particular case. Fix confirmed by Ion Badulescu. Signed-off-by: David S. Miller commit 01ff367e62f0474e4d39aa5812cbe2a30d96e1e9 Author: David S. Miller Date: Thu Sep 29 17:07:20 2005 -0700 [TCP]: Revert 6b251858d377196b8cea20e65cae60f584a42735 But retain the comment fix. Alexey Kuznetsov has explained the situation as follows: -------------------- I think the fix is incorrect. Look, the RFC function init_cwnd(mss) is not continuous: f.e. for mss=1095 it needs initial window 1095*4, but for mss=1096 it is 1096*3. We do not know exactly what mss sender used for calculations. If we advertised 1096 (and calculate initial window 3*1096), the sender could limit it to some value < 1096 and then it will need window his_mss*4 > 3*1096 to send initial burst. See? So, the honest function for inital rcv_wnd derived from tcp_init_cwnd() is: init_rcv_wnd(mss)= min { init_cwnd(mss1)*mss1 for mss1 <= mss } It is something sort of: if (mss < 1096) return mss*4; if (mss < 1096*2) return 1096*4; return mss*2; (I just scrablled a graph of piece of paper, it is difficult to see or to explain without this) I selected it differently giving more window than it is strictly required. Initial receive window must be large enough to allow sender following to the rfc (or just setting initial cwnd to 2) to send initial burst. But besides that it is arbitrary, so I decided to give slack space of one segment. Actually, the logic was: If mss is low/normal (<=ethernet), set window to receive more than initial burst allowed by rfc under the worst conditions i.e. mss*4. This gives slack space of 1 segment for ethernet frames. For msses slighlty more than ethernet frame, take 3. Try to give slack space of 1 frame again. If mss is huge, force 2*mss. No slack space. Value 1460*3 is really confusing. Minimal one is 1096*2, but besides that it is an arbitrary value. It was meant to be ~4096. 1460*3 is just the magic number from RFC, 1460*3 = 1095*4 is the magic :-), so that I guess hands typed this themselves. -------------------- Signed-off-by: David S. Miller commit dce79affd5d04e9cbabe35016eda55213b9b36f6 Author: Daniel Jacobowitz Date: Fri Sep 30 00:17:35 2005 +0100 [ARM] 2941/1: Fix running legacy binaries from a soft-float root filesystem with CONFIG_IWMMXT. Patch from Daniel Jacobowitz Thread flags are inherited on fork(). In order for a binary which has the iWMMXt coprocessor enabled to run a binary which needs the FPA emulation, we need to explicitly clear TIF_USING_IWMMXT if we are not going to set it. Signed-off-by: Daniel Jacobowitz Signed-off-by: Russell King commit a44fe13eab664ac488ced0845d9885b019bd24c5 Author: Benjamin Herrenschmidt Date: Fri Sep 30 08:25:17 2005 +1000 [PATCH] Fix ppc64 smu driver locking The SMU driver has a small mistake in the locking of the interrupt code, if polled access and interrupt access race, interrupt may take a lock and return without releasing it. This fixes it. With that patch, the driver is rock solid with my experimental thermal control (which bangs it pretty hard) racing with real time clock and cpufreq handling. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 411b67b4b6a4dd1e0292a6a58dd753978179d173 Author: Kostik Belousov Date: Wed Sep 28 18:21:28 2005 +0300 [PATCH] readv/writev syscalls are not checked by lsm it seems that readv(2)/writev(2) syscalls do not call file_permission callback. Looks like this is overlook. I have filled the issue into redhat bugzilla as https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=169433 and got the recommendation to post this on lsm mailing list. The following trivial patch solves the problem. Signed-off-by: Kostik Belousov Signed-off-by: Chris Wright commit 7644143cd6f7e029f3a8ea64f5fb0ab33ec39f72 Author: Mike Waychison Date: Fri Sep 30 00:01:27 2005 +0200 [PATCH] x86_64: Fix mce_log The attempt to fixup the lockless mce log buffer introduced an infinite loop when trying to find a free entry. And: Using rcu_dereference() to load mcelog.next doesn't seem to be sufficient enough to ensure that mcelog.next is loaded each time around the loop in mce_log(). Instead, use an explicit rmb() to ensure that the compiler gets it right. AK: turned the smp_wmbs into true wmbs to make sure they are not reordered by the compiler on UP. Signed-off-by: Mike Waychison Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7d318d774789657c37a5e994a4a2cf59d4879ae7 Author: Andi Kleen Date: Thu Sep 29 22:05:55 2005 +0200 [PATCH] Fix up TLB flush filter disabling I checked with AMD and they requested to only disable it for family 15. Also disable it for i386 too. And some style fixes. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5acbc5cb507e6c381b70093b1081854708e82b16 Author: Roland McGrath Date: Thu Sep 29 14:54:42 2005 -0700 [PATCH] Fix task state testing properly in do_signal_stop() Any tests using < TASK_STOPPED or the like are left over from the time when the TASK_ZOMBIE and TASK_DEAD bits were in the same word, and it served to check for "stopped or dead". I think this one in do_signal_stop is the only such case. It has been buggy ever since exit_state was separated, and isn't testing the exit_state value. Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit 4a8342d233a39ee582e9f7260e12d2f5fd194a05 Author: Linus Torvalds Date: Thu Sep 29 15:18:21 2005 -0700 Revert task flag re-ordering, add comments Roland points out that the flags end up having non-obvious dependencies elsewhere, so revert aa55a08687059aa169d10a313c41f238c2070488 and add some comments about why things are as they are. We'll just have to fix up the broken comparisons. Roland has a patch. Signed-off-by: Linus Torvalds commit aa55a08687059aa169d10a313c41f238c2070488 Author: Oleg Nesterov Date: Thu Sep 29 19:58:53 2005 +0400 [PATCH] fix TASK_STOPPED vs TASK_NONINTERACTIVE interaction do_signal_stop: for_each_thread(t) { if (t->state < TASK_STOPPED) ++sig->group_stop_count; } However, TASK_NONINTERACTIVE > TASK_STOPPED, so this loop will not count TASK_INTERRUPTIBLE | TASK_NONINTERACTIVE threads. See also wait_task_stopped(), which checks ->state > TASK_STOPPED. Signed-off-by: Oleg Nesterov [ We really probably should always use the appropriate bitmasks to test task states, not do it like this. Using something like #define TASK_RUNNABLE (TASK_RUNNING | TASK_INTERRUPTIBLE | \ TASK_UNINTERRUPTIBLE | TASK_NONINTERACTIVE) and then doing "if (task->state & TASK_RUNNABLE)" or similar. But the ordering of the task states is historical, and keeping the ordering does make sense regardless. ] Signed-off-by: Linus Torvalds commit b38708fca9cc60d8a073a67c3b366116e38011c5 Author: Deepak Saxena Date: Wed Sep 28 18:07:01 2005 -0700 [PATCH] Fix thinko in previous ARM 2917/1 patch Previous patch accidently add IXDP425 mach entry when IXDP465 is configured. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit 82810a906f8734ae6503ea11436a7164d2f86f2e Author: Deepak Saxena Date: Wed Sep 28 16:42:54 2005 -0700 [PATCH] Fix ixp4xx MTD driver module build Missing ';' breaks module build. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit fe984bba30a29398578da3d8c0503fa39e84b838 Author: Ben Dooks Date: Thu Sep 29 05:24:38 2005 +0800 [PATCH] s3c2410fb: Minor warning fix The function s3c2410fb_activate_var does not return a value, therefore it should be declared void. Signed-off-by: Ben Dooks Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 375726d7ed08bd8cf2fe3cfe6b164ffb37fa7e90 Author: Antonino A. Daplas Date: Thu Sep 29 05:19:51 2005 +0800 [PATCH] intelfb: Fix regression (blank display) from ioremap patch - Workaround for the ioremap patch that produces a blank display on some chipsets - Make hwcursor = 0 the default. The hardware cursor does not work with all hardware. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit b2846dfa4aa1bbbf3f9977d67566952d7f621009 Author: Al Viro Date: Thu Sep 29 00:42:27 2005 +0100 [PATCH] mv64x60_wdt __user annotations and cleanups - use nonseekable_open() instead of messing with if (*ppos != file->f_pos) return -EISPIPE in ->write() (->read is NULL). - trivial __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ae8aed0314064da3002879fedc2d262c72865a17 Author: Al Viro Date: Thu Sep 29 00:37:34 2005 +0100 [PATCH] saa6588 __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit be88ec74cb48d1f60d0c0f059843f846f4481d87 Author: Al Viro Date: Thu Sep 29 00:36:10 2005 +0100 [PATCH] i810-i2c iomem annotations Signed-off-by: Al Viro Acked-by: Antonino Daplas Signed-off-by: Linus Torvalds commit a7625d6e49cb4fd94be7576d85422c33003101b7 Author: Al Viro Date: Thu Sep 29 00:34:30 2005 +0100 [PATCH] mv64x60 iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9fcdfcd90526c8c5c2bd117fd3713f8f0f1a46a8 Author: Al Viro Date: Thu Sep 29 00:31:14 2005 +0100 [PATCH] ppc32 ld.script fix for building on ppc64 In arch/ppc/boot/ld.script we need OUTPUT_ARCH(powerpc:common) for the same reasons why we need it in vmlinux.lds.S; when we build on ppc64 box, we need to be explicit about the target. See http://linus.bkbits.net:8080/linux-2.5/cset@1.1784.8.10 for the corresponding fix in vmlinux.lds.S. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ea8a918eb71b503be13b861dbe18b93932fd6b62 Author: Al Viro Date: Thu Sep 29 00:17:49 2005 +0100 [PATCH] ppc64 get_user annotations long is not uintptr_t, unsigned long is. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c28144763a7dcdceb2c16a5ac9c8e0022d547d28 Author: Al Viro Date: Thu Sep 29 00:16:02 2005 +0100 [PATCH] s390 signal annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0cc13a5442901835192ba47427f0f4e4d525d935 Author: Al Viro Date: Thu Sep 29 00:12:13 2005 +0100 [PATCH] ia64 basic __user annotations - document places where we pass kernel address to low-level primitive that deals with kernel/user addresses - uintptr_t is unsigned long, not long Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 272cd2b71d478371e0a5bf2c76a1e50cbf178698 Author: Al Viro Date: Thu Sep 29 00:10:01 2005 +0100 [PATCH] arm/rpc iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2ad4f86b60b649fd7428265c08d73a3bd360c81b Author: Al Viro Date: Thu Sep 29 00:09:02 2005 +0100 [PATCH] arm/versatile iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 775b048d09c85d87a65a7ccd9c4f9372953a5d95 Author: Al Viro Date: Thu Sep 29 00:07:29 2005 +0100 [PATCH] cyblafb: portability fixes, sanitized work with pointers Signed-off-by: Al Viro Acked-by: Knut Petersen Signed-off-by: Linus Torvalds commit 87e0f3dbd3693bc4583474ab191cbdd5e3d9d0fa Author: Alexey Dobriyan Date: Thu Sep 29 00:05:58 2005 +0100 [PATCH] n_r3964: drop bogus fmt casts - print pointers with %p - casting pointer structure field to int and printing it with %d... Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 666002218d59db271e5c1ede1d80227170c51987 Author: Al Viro Date: Wed Sep 28 22:32:57 2005 +0100 [PATCH] proc_mkdir() should be used to create procfs directories A bunch of create_proc_dir_entry() calls creating directories had crept in since the last sweep; converted to proc_mkdir(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ecba97d4aacf4e80c56eb73e39af0369cb8539a4 Author: Al Viro Date: Wed Sep 28 22:27:23 2005 +0100 [PATCH] uml makefiles sanitized UML makefiles sanitized: - number of generated headers reduced to 2 (from user-offsets.c and kernel-offsets.c resp.). The rest is made constant and simply includes those two. - mk_... helpers are gone now that we don't need to generate these headers - arch/um/include2 removed since everything under arch/um/include/sysdep is constant now and symlink can point straight to source tree. - dependencies seriously simplified. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fc611a1a50caa04bae82ed3c1fc6505132f8343f Author: Russell King Date: Thu Sep 29 11:15:51 2005 +0100 [ARM] Don't include mach-types.h unnecessarily It's pointless to include mach-types.h if you're not going to use anything from it. These references were removed as a result of: grep -lr 'asm/mach-types\.h' . | xargs grep -L 'machine_is_\|MACH_TYPE_\|MACHINE_START\|machine_type' Signed-off-by: Russell King commit d0877904470c149c6553f1309cfed6c90d67cf91 Author: Russell King Date: Thu Sep 29 11:12:52 2005 +0100 [ARM] Don't include asm/arch/hardware.h directly Since asm/hardware.h's only reason for existing is to include asm/arch/hardware.h, it's completely pointless to include both. Signed-off-by: Russell King commit eb9181a2f85d46cdbbd3cb18b4541f8ab2df0933 Author: Russell King Date: Thu Sep 29 09:49:25 2005 +0100 [ARM] Fix warning in arch/arm/mach-pxa/generic.c Fix arch/arm/mach-pxa/generic.c:242: warning: 'struct i2c_pxa_platform_data' declared inside parameter list caused by missing asm/arch/i2c.h include. Signed-off-by: Russell King commit ca5da7106214e03f5302ca630bd38a9145b27391 Author: Russell King Date: Thu Sep 29 09:44:54 2005 +0100 [ARM] pxafb: Remove #if DEBUG, convert DPRINTK to pr_debug Fix warning: drivers/video/pxafb.h:119:5: warning: "DEBUG" is not defined by removing the whole #if DEBUG #define DPRINTK(fmt, args...) printk...etc... #else #define DPRINTK(fmt, args...) #endif stuff - we have pr_debug() for this. Signed-off-by: Russell King commit 01d40f28b125e0a9aa0ec24642be67fc4c5dfaff Author: David S. Miller Date: Wed Sep 28 22:37:53 2005 -0700 [NET]: Fix reversed logic in eth_type_trans(). I got the second compare_eth_addr() test reversed, oops. Signed-off-by: David S. Miller commit ed3ffaf7b5e0262cb860f106a6632933671cc88f Author: David S. Miller Date: Wed Sep 28 21:48:25 2005 -0700 [SPARC64]: Solidify check in cheetah_check_main_memory(). Need to make sure the address is below high_memory before passing it to kern_addr_valid(). Signed-off-by: David S. Miller commit 10147570f9eaff3920f0c67bad7244c2eb958d4f Author: David S. Miller Date: Wed Sep 28 21:46:43 2005 -0700 [SPARC64]: Kill all external references to sp_banks[] Thus, we can mark sp_banks[] static in arch/sparc64/mm/init.c Signed-off-by: David S. Miller commit 0836a0eb4073c3e0a09c5965833b9dec19f5abc7 Author: David S. Miller Date: Wed Sep 28 21:38:08 2005 -0700 [SPARC64]: Move phys_base, kern_{base,size}, and sp_banks[] init to paging_init Also, move prom_probe_memory() into arch/sparc64/mm/init.c Signed-off-by: David S. Miller commit 801ab3c731e77324c055769491711e620100dbfb Author: David S. Miller Date: Wed Sep 28 21:31:25 2005 -0700 [SPARC]: Declare paging_init() in asm/pgtable.h Signed-off-by: David S. Miller commit efdc1e2083e04cc70721d55803889b346c1a3de2 Author: David S. Miller Date: Wed Sep 28 21:06:47 2005 -0700 [SPARC64]: Simplify user fault fixup handling. Instead of doing byte-at-a-time user accesses to figure out where the fault occurred, read the saved fault_address from the current thread structure. For the sake of defensive programming, if the fault_address does not fall into the user buffer range, simply assume the whole area faulted. This will cause the fixup for copy_from_user() to clear the entire kernel side buffer. Signed-off-by: David S. Miller commit 5fd29752f09cabff582f65c0ce35518db4c64937 Author: David S. Miller Date: Wed Sep 28 20:41:45 2005 -0700 [SPARC64]: Fix fault handling in unaligned trap handler. We were not calling kernel_mna_trap_fault() correctly. Instead of being fancy, just return 0 vs. -EFAULT from the assembler stubs, and handle that return value as appropriate. Create an "__retl_efault" stub for assembler exception table entries and use it where possible. Signed-off-by: David S. Miller commit 8cf14af0a740fb7e9f94a203b5a989beb875d58f Author: David S. Miller Date: Wed Sep 28 20:21:11 2005 -0700 [SPARC64]: Convert to use generic exception table support. The funny "range" exception table entries we had were only used by the compat layer socketcall assembly, and it wasn't even needed there. For free we now get proper exception table sorting and fast binary searching. Signed-off-by: David S. Miller commit 705747ab87c96f1b4b8e73ba617c323d9087f6ac Author: David S. Miller Date: Wed Sep 28 16:48:40 2005 -0700 [SPARC64]: Fix bug in unaligned load endianness swapping The in-memory value was being swapped, not the value we loaded into the register. Signed-off-by: David S. Miller commit 735631a9196db42631b8817892605ee72e13a58b Author: Martin Whitaker Date: Wed Sep 28 16:35:22 2005 -0700 [ATM]: fix bug in atm address list handling From: Martin Whitaker Signed-off-by: Chas Williams commit 9301e320e98ff19a0e48881b038d0c24ca76e6c0 Author: Chas Williams Date: Wed Sep 28 16:35:01 2005 -0700 [ATM]: track and close listen sockets when sigd exits Signed-off-by: Chas Williams commit e2c4b72158a9f1286df41dee478e774f1b94e93a Author: Roman Kagan Date: Wed Sep 28 16:34:24 2005 -0700 [ATM]: net/atm/ioctl.c: autoload pppoatm and br2684 Signed-off-by: Roman Kagan Signed-off-by: Chas Williams commit 6b251858d377196b8cea20e65cae60f584a42735 Author: David S. Miller Date: Wed Sep 28 16:31:48 2005 -0700 [TCP]: Fix init_cwnd calculations in tcp_select_initial_window() Match it up to what RFC2414 really specifies. Noticed by Rick Jones. Signed-off-by: David S. Miller commit 54bb5675a6e966a58755ac44e3407f8ec2272b82 Author: Dominik Brodowski Date: Wed Sep 28 19:29:59 2005 +0200 [PATCH] pcmcia: only start up nonstatic sockets if both mem and io are available Only start up nonstatic sockets if both IO and MEM resources are available. Thanks to Russell King and Matthew Wilcox for tracking this down. Signed-off-by: Dominik Brodowski commit 1146bc743e074760ef0dd08b3457f35a68069a54 Author: Dominik Brodowski Date: Wed Sep 28 19:28:37 2005 +0200 [PATCH] pcmcia: allow one port excludes Allow for excluding only one port in /etc/pcmcia/config.otps Signed-off-by: Dominik Brodowski commit 664cceb0093b755739e56572b836a99104ee8a75 Author: David Howells Date: Wed Sep 28 17:03:15 2005 +0100 [PATCH] Keys: Add possessor permissions to keys [try #3] The attached patch adds extra permission grants to keys for the possessor of a key in addition to the owner, group and other permissions bits. This makes SUID binaries easier to support without going as far as labelling keys and key targets using the LSM facilities. This patch adds a second "pointer type" to key structures (struct key_ref *) that can have the bottom bit of the address set to indicate the possession of a key. This is propagated through searches from the keyring to the discovered key. It has been made a separate type so that the compiler can spot attempts to dereference a potentially incorrect pointer. The "possession" attribute can't be attached to a key structure directly as it's not an intrinsic property of a key. Pointers to keys have been replaced with struct key_ref *'s wherever possession information needs to be passed through. This does assume that the bottom bit of the pointer will always be zero on return from kmem_cache_alloc(). The key reference type has been made into a typedef so that at least it can be located in the sources, even though it's basically a pointer to an undefined type. I've also renamed the accessor functions to be more useful, and all reference variables should now end in "_ref". Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit 5134fc15b643dc36eb9aa77e4318b886844a9ac5 Author: Paul Jackson Date: Wed Sep 28 06:42:24 2005 -0700 [PATCH] cpuset read past eof memory leak fix Don't leak a page of memory if user reads a cpuset file past eof. Signed-off-by: KUROSAWA Takahiro Signed-off-by: Paul Jackson Signed-off-by: Linus Torvalds commit 5c382300876f2337f7b945c159ffcaf285f296ea Author: Alok N Kataria Date: Tue Sep 27 21:45:46 2005 -0700 [PATCH] kmalloc_node IRQ safety fix In kmalloc_node we are checking if the allocation is for the same node when interrupts are "on". This may lead to an allocation on another node than intended. This patch just shifts the check for the current node in __cache_alloc_node when interrupts are disabled. Signed-off-by: Alok N Kataria Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f9578b70a9f112bfb541e1d5ab486a376e64503 Author: Benjamin Herrenschmidt Date: Tue Sep 27 21:45:45 2005 -0700 [PATCH] ppc64: More hugepage fixes My previous patch fixing invalidation of huge PTEs wasn't good enough, we still had an issue if a PTE invalidation batch contained both small and large pages. This patch fixes this by making sure the batch is flushed if the page size fed to it changes. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 485ef69edefd7fc7f351c94d0d77b3ed8a242f7b Author: Alasdair G Kergon Date: Tue Sep 27 21:45:45 2005 -0700 [PATCH] device-mapper: Fix queue_if_no_path initialisation When creating a multipath device, if the queue_if_no_path parameter is specified it gets ignored. While the queue_if_no_path variable is correctly set to 1, the saved_queue_if_no_path gets set to 0. When the device is subsequently made live (resumed), the saved value (0) always overwrites the live value (1) so the option *always* gets turned off. The fix adds a parameter to the queue_if_no_path() function to indicate whether the previous value should be preserved or not - if not, as when the device is being set up, the saved value is set to the new value (1). Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 269fd2a6f84828fd96218d164dace8c413fa5c03 Author: goggin, edward Date: Tue Sep 27 21:45:44 2005 -0700 [PATCH] device-mapper: Trigger an event when a table is deleted If anything is waiting on a device's table when the device is removed, we must first wake it up so it will release its reference. Otherwise the table's reference count will not drop to zero and the table will not get removed. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f7347c20c410c300be0db4c132945fd02e54110 Author: Rafael J. Wysocki Date: Tue Sep 27 21:45:43 2005 -0700 [PATCH] swsusp: avoid problems if there are too many pages to save The following patch makes swsusp avoid problems during resume if there are too many pages to save on suspend. It adds a constant that allows us to verify if we are going to save too many pages and implements the check (this is done as early as we can tell that the check will trigger, which is in swsusp_alloc()). Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f65a4d10c8a4eb9f919cf416e5dcd720b7d20f50 Author: Benjamin Herrenschmidt Date: Tue Sep 27 21:45:41 2005 -0700 [PATCH] orinoco: Fix flood of kernel log with stupid WE warnings Latest wireless extensions moved a field from netdev -> wireless_handlers. The WE core will now printk a warning on every call to get_wireless_stats() on a driver that still uses the old field. This patch fixes orinoco. Signed-off-by: Benjamin Herrenschmidt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3ca80935100af47f226be439cb266378dab7bf7 Author: Anton Blanchard Date: Tue Sep 27 21:45:38 2005 -0700 [PATCH] ppc64: Add missing barrier() in kexec code Mikey and I were testing kexec and hit a lockup. It turns out gcc 4.0 optimises the kexec_prepare_cpus loop so we avoid reloading paca.hw_cpu_id. A gcc barrier() fixes the problem. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed90fb4a19956cece996eb1d26534f592918730e Author: Paul Jackson Date: Tue Sep 27 21:45:37 2005 -0700 [PATCH] cpuset maintainers Specify the cpuset maintainers. Signed-off-by: Paul Jackson Signed-off-by: Simon Derr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c132b5fe6579ed4b4892c02fe6c05f7e3afc579 Author: john stultz Date: Tue Sep 27 21:45:36 2005 -0700 [PATCH] x86-64: Fix bad assumption that dualcore cpus have synced TSCs This should resolve the issue seen in bugme bug #5105, where it is assumed that dualcore x86_64 systems have synced TSCs. This is not the case, and alternate timesources should be used instead. For more details, see: http://bugzilla.kernel.org/show_bug.cgi?id=5105 Andi's earlier concerns that the TSCs should be synced on dualcore systems have been resolved by confirmation from AMD folks that they can be unsynced. Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9d014afc3609e3094fd06176380ed057edd4a1b Author: Corey Minyard Date: Tue Sep 27 21:45:35 2005 -0700 [PATCH] Add IPMI poweroff control to sysfs Put the IPMI poweroff_powercycle parameter into sysfs. This field is dynamically settable and is valuable to have in sysfs. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4208b9a9538baabad197276076bc1d4f52d42b9 Author: Benjamin Herrenschmidt Date: Tue Sep 27 21:45:35 2005 -0700 [PATCH] ppc: fix stupid thinko in oprofile fix I did something stupid in my oprofile fix, here's the obvious fix: Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f36462f078403c1859a7e58177b28e01b3a179e4 Author: Rusty Russell Date: Tue Sep 27 21:45:34 2005 -0700 [PATCH] Ignore trailing whitespace on kernel parameters correctly Dave Jones says: ... if the modprobe.conf has trailing whitespace, modules fail to load with the following helpful message.. snd_intel8x0: Unknown parameter `' Previous version truncated last argument. Signed-off-by: Rusty Russell Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3306dd5f7eb2e699f36a4a313fca4b48b18d5e1 Author: Davide Libenzi Date: Tue Sep 27 21:45:33 2005 -0700 [PATCH] epoll: handle timeout overflow Handle the timeout upper boundary for epoll. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2d613799af915da1fd78463ba8ec5086a0d6f92 Author: Rafael J. Wysocki Date: Tue Sep 27 21:45:32 2005 -0700 [PATCH] swsusp: prevent possible memory leak Prevent swsusp from leaking some memory in case of an error in read_pagedir(). It also prevents the BUG_ON() from triggering if there's an error while reading swap. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 254b54771cc4c00002f796be65d2885191dca9dc Author: Rafael J. Wysocki Date: Tue Sep 27 21:45:31 2005 -0700 [PATCH] swsusp: remove wrong code from data_free The following patch removes some wrong code from the data_free() function in swsusp. This function could only be called if there's an error while writing the suspend image to swap, so it is not triggered easily. However, if triggered, it would probably corrupt some memory. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 249a6771afcdfaca0ac178f63343aff2c4dc2853 Author: Peter Osterlund Date: Tue Sep 27 21:45:30 2005 -0700 [PATCH] pktcdvd: MAINTAINERS record Add a MAINTAINERS entry for the pktcdvd driver. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88bdcc5d5e9a7ea280f99262f48b70aba9d949bf Author: Jon Burgess Date: Tue Sep 27 21:45:26 2005 -0700 [PATCH] dvb: fix NULL pointer dereference when loading the budget-av module Ralph Metzler wrote: > AFAIR, there is a bug in tda10021.c in tda10021_readreg() which > references state->frontend.dvb->num > This is fatal if the frontend is not at the probed address and thus > not yet registered (no dvb entry set yet -> NULL pointer ...). The attached patch should get rid of the oops. Signed-off-by: Jon Burgess Cc: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b8dd17762194ec77066d339e0b2866b0c66b715 Author: Latchesar Ionkov Date: Tue Sep 27 21:45:24 2005 -0700 [PATCH] v9fs: fix races in fid allocation Fid management cleanup. The patch attempts to fix the races in dentry's fid management. Dentries don't keep the opened fids anymore, they are moved to the file structs. Ideally there should be no more than one fid with fidcreate equal to zero in the dentry's list of fids. v9fs_fid_create initializes the important fields (fid, fidcreated) before v9fs_fid is added to the list. v9fs_fid_lookup returns only fids that are not created by v9fs_create. v9fs_fid_get_created returns the fid created by the same process by v9fs_create (if any) and removes it from dentry's list Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc7b5fd6b0d3beb41f9e5e3a94dd1eadf52209f3 Author: Chris Sykes Date: Tue Sep 27 21:45:23 2005 -0700 [PATCH] Fix ext3_new_inode() failure paths Fix failure paths in ext3_new_inode() and clean up duplicated code: - DQUOT_DROP() was not being called if ext3_init_security() failed. Signed-off-by: Chris Sykes Cc: Stephen Smalley Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ed6c2fb34a1fb493caec8a9644d05bb880a6923 Author: Chris Sykes Date: Tue Sep 27 21:45:22 2005 -0700 [PATCH] Fix ext2_new_inode() failure paths Fix failure paths in ext2_new_inode() and clean up duplicated code: - DQUOT_DROP() was not being called if ext2_init_security() failed. Signed-off-by: Chris Sykes Cc: Stephen Smalley Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee4e52719ce474af339f4b81ece2ce9ecf920dfd Author: Miklos Szeredi Date: Tue Sep 27 21:45:21 2005 -0700 [PATCH] fuse: check reserved node ID values This patch checks reserved node ID values returned by lookup and creation operations. In case one of the reserved values is sent, return -EIO. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 909021ea7a8f4ef13af54935b87b03a20906e08a Author: Miklos Szeredi Date: Tue Sep 27 21:45:20 2005 -0700 [PATCH] fuse: add required version info Add information about required version of the userspace library/utilities to Documentation/Changes. Also add pointer to this and to FUSE documentation from Kconfig. Thanks to Anton Altaparmakov for the reminder. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b1f3124618b54cf125dea3a074b9cf469117723 Author: Nick Piggin Date: Tue Sep 27 21:45:18 2005 -0700 [PATCH] mm: move_pte to remap ZERO_PAGE Move the ZERO_PAGE remapping complexity to the move_pte macro in asm-generic, have it conditionally depend on __HAVE_ARCH_MULTIPLE_ZERO_PAGE, which gets defined for MIPS. For architectures without __HAVE_ARCH_MULTIPLE_ZERO_PAGE, move_pte becomes a noop. From: Hugh Dickins Fix nasty little bug we've missed in Nick's mremap move ZERO_PAGE patch. The "pte" at that point may be a swap entry or a pte_file entry: we must check pte_present before perhaps corrupting such an entry. Patch below against 2.6.14-rc2-mm1, but the same bug is in 2.6.14-rc2's mm/mremap.c, and more dangerous there since it's affecting all arches: I think the safest course is to send Nick's patch and Yoichi's build fix and this fix (build tested) on to Linus - so only MIPS can be affected. Signed-off-by: Nick Piggin Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2212bc7db13268bef0799d9ff4b2e511c284885 Author: David S. Miller Date: Tue Sep 27 22:50:06 2005 -0700 [SPARC64]: Add missing IDs for newer cpus. Also, the us3_cpufreq driver can work on Ultra-IV and IV+. They use the SAFARI bus register to control the clock divider just like Ultra-III and III+ do. Signed-off-by: David S. Miller commit f16af555cc46a724507da371fbac94b430c93315 Author: David S. Miller Date: Tue Sep 27 22:37:08 2005 -0700 [SPARC64]: Add defines for 32MB/256MB PTE page size on Ultra-IV+. Signed-off-by: David S. Miller commit 64233bffbb50f12e576c61d1698a573c8033004a Author: Oliver Dawid Date: Tue Sep 27 16:11:29 2005 -0700 [APPLETALK]: Fix broadcast bug. From: Oliver Dawid we found a bug in net/appletalk/ddp.c concerning broadcast packets. In kernel 2.4 it was working fine. The bug first occured 4 years ago when switching to new SNAP layer handling. This bug can be splitted up into a sending(1) and reception(2) problem: Sending(1) In kernel 2.4 broadcast packets were sent to a matching ethernet device and atalk_rcv() was called to receive it as "loopback" (so loopback packets were shortcutted and handled in DDP layer). When switching to the new SNAP structure, this shortcut was removed and the loopback packet was send to SNAP layer. The author forgot to replace the remote device pointer by the loopback device pointer before sending the packet to SNAP layer (by calling ddp_dl->request() ) therfor the packet was not sent back by underlying layers to ddp's atalk_rcv(). Reception(2) In atalk_rcv() a packet received by this loopback mechanism contains now the (rigth) loopback device pointer (in Kernel 2.4 it was the (wrong) remote ethernet device pointer) and therefor no matching socket will be found to deliver this packet to. Because a broadcast packet should be send to the first matching socket (as it is done in many other protocols (?)), we removed the network comparison in broadcast case. Below you will find a patch to correct this bug. Its diffed to kernel 2.6.14-rc1 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ba645c16026ed733a51f904df34756f61bc155fc Author: David S. Miller Date: Tue Sep 27 16:03:05 2005 -0700 [NET]: Slightly optimize ethernet address comparison. We know the thing is at least 2-byte aligned, so take advantage of that instead of invoking memcmp() which results in truly horrifically inefficient code because it can't assume anything about alignment. Signed-off-by: David S. Miller commit 2fab35d78f32fc107e1af4b1ec23f557fa20d911 Author: Ben Dooks Date: Tue Sep 27 15:59:43 2005 -0700 [NET]: Fix GCC4 compile error: sysctl in linux/if_ether.h The following is generated when compiling a recent (2.6.14-rc2-git5) kernel configured for ARM, with GCC4. CC init/main.o In file included from include/linux/netdevice.h:29, from include/net/sock.h:48, from init/main.c:50: include/linux/if_ether.h:114: error: array type has incomplete element type It seems that if CONFIG_SYSCTL is not set, then the compiler will throw an error due to the definition of the ether_table[] array Attached is a solution to the problem Signed-off-by: Ben Dooks Signed-off-by: David S. Miller commit 520d1b830a93086c1f9e969d98f7ef01f0356493 Author: Alexey Dobriyan Date: Tue Sep 27 15:45:15 2005 -0700 [ROSE]: fix typo (regeistration) Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit a83cd2cc90bd9390cf03cd40bba204d9ed520633 Author: Alexey Dobriyan Date: Tue Sep 27 15:44:36 2005 -0700 [ROSE]: check rose_ndevs earlier * Don't bother with proto registering if rose_ndevs is bad. * Make escape structure more coherent. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 70ff3b66d79c5110e533f3f2aea1a5b2fc5f8d90 Author: Alexey Dobriyan Date: Tue Sep 27 15:43:46 2005 -0700 [ROSE]: return sane -E* from rose_proto_init() Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit c3c4ed652e8f2c348ebdd3f2e45664a0e238ee52 Author: Alexey Dobriyan Date: Tue Sep 27 15:42:58 2005 -0700 [ROSE]: do proto_unregister() on exit paths Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 1f26dac32057baaf67d10b45c6b5277db862911d Author: David S. Miller Date: Tue Sep 27 15:24:13 2005 -0700 [NET]: Add Sun Cassini driver. Written by Adrian Sun (asun@darksunrising.com). Ported to 2.6.x by Tom 'spot' Callaway . Further cleaned up and integrated by David S. Miller Signed-off-by: David S. Miller commit a79af59efd20990473d579b1d8d70bb120f0920c Author: Frank Filz Date: Tue Sep 27 15:23:38 2005 -0700 [NET]: Fix module reference counts for loadable protocol modules I have been experimenting with loadable protocol modules, and ran into several issues with module reference counting. The first issue was that __module_get failed at the BUG_ON check at the top of the routine (checking that my module reference count was not zero) when I created the first socket. When sk_alloc() is called, my module reference count was still 0. When I looked at why sctp didn't have this problem, I discovered that sctp creates a control socket during module init (when the module ref count is not 0), which keeps the reference count non-zero. This section has been updated to address the point Stephen raised about checking the return value of try_module_get(). The next problem arose when my socket init routine returned an error. This resulted in my module reference count being decremented below 0. My socket ops->release routine was also being called. The issue here is that sock_release() calls the ops->release routine and decrements the ref count if sock->ops is not NULL. Since the socket probably didn't get correctly initialized, this should not be done, so we will set sock->ops to NULL because we will not call try_module_get(). While searching for another bug, I also noticed that sys_accept() has a possibility of doing a module_put() when it did not do an __module_get so I re-ordered the call to security_socket_accept(). Signed-off-by: Frank Filz Signed-off-by: David S. Miller commit 9356b8fc07dc126cd91d2b12f314d760ab48996e Author: Eric Dumazet Date: Tue Sep 27 15:23:16 2005 -0700 [NET]: Reorder some hot fields of struct net_device Place them on separate cache lines in SMP to lower memory bouncing between multiple CPU accessing the device. - One part is mostly used on receive path (including eth_type_trans()) (poll_list, poll, quota, weight, last_rx, dev_addr, broadcast) - One part is mostly used on queue transmit path (qdisc) (queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len) - One part is mostly used on xmit path (device) (xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start) 'features' is placed outside of these hot points, in a location that may be shared by all cpus (because mostly read) name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 2d7ceece08ad940d0ceac98ab1b5a3b82dfc2a0a Author: Eric Dumazet Date: Tue Sep 27 15:22:58 2005 -0700 [NET]: Prefetch dev->qdisc_lock in dev_queue_xmit() We know the lock is going to be taken. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit bc8dfcb93970ad7139c976356bfc99d7e251deaf Author: Daniel Phillips Date: Tue Sep 27 15:22:35 2005 -0700 [NET]: Use non-recursive algorithm in skb_copy_datagram_iovec() Use iteration instead of recursion. Fraglists within fraglists should never occur, so we BUG check this. Signed-off-by: Daniel Phillips Signed-off-by: David S. Miller commit a1c337afaf4ec4d4eabc75a5e1170d03161de4e1 Author: Jack Morgenstein Date: Tue Sep 27 13:54:44 2005 -0700 [IB] mthca: fix hw_ver value returned from mthca_query_device The IB spec defines the field to be 32 bits, not 16 bits. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 59175839783287d3b03f18460bb3539c69300837 Author: Krzysztof Benedyczak Date: Tue Sep 27 22:21:36 2005 +0200 [PATCH] Make POSIX message queue sys_mq_open() honor umask We ignored umask when creating new queues via mq_open (when creating with open() on mqueue fs it is ok of course). According to the specification this a bug. This trivial patch fixes this. Signed-off-by: Krzysztof Benedyczak Signed-off-by: Linus Torvalds commit c8a6c2963982c68475f409aeee21aa80b923cb9c Author: David S. Miller Date: Tue Sep 27 12:13:38 2005 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit f9804ddbeec2ea709255830a8822bfb4e7584f6a Author: Michael Chan Date: Tue Sep 27 12:13:10 2005 -0700 [TG3]: misc. fixes Fix interrupt test handler by adding check for IRQ assertion in PCI_STATE register in addition to the status block updated bit. Add test for valid ethernet address in tg3_set_mac_addr(). Add tg3_bus_string() to setup the PCI bus speed/width string for all PCI/PCIX/PCI Express devices. This is used to print the bus type during init_one(). Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c94e39418ab6eccf863581f4e0d847da0080b2d3 Author: Michael Chan Date: Tue Sep 27 12:12:42 2005 -0700 [TG3]: 5780 PHY fixes Fix 5780 PHY related problems: 1. MAC_RX_MODE reset must be done before setting up the MAC_MODE register on 5705_PLUS chips or the chip will stop receiving after a while. The MAC_RX_MODE reset is needed to prevent intermittently losing the first receive packet on serdes chips. 2. Skip MAC loopback test on 5780 because of hardware errata. Normal traffic including PHY loopback is not affected by the errata. 3. PHY loopback fails intermittently on 5708S and this is fixed by putting the PHY in loopback mode first before programming the MAC mode register. A MAC_RX_MODE reset is also added. 4. Return -EINVAL in tg3_nway_reset() if device is in TBI mode. Allow nway_reset if 5780S is in parallel detect mode. 5. Add missing PHY IDs in KNOWN_PHY_ID() macro. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 667347f1ca7e099f6833551f194cf2bcc778871b Author: David S. Miller Date: Tue Sep 27 12:07:44 2005 -0700 [NEIGH]: Add debugging check when adding timers. If we double-add a neighbour entry timer, which should be impossible but has been reported, dump the current state of the entry so that we can debug this. Signed-off-by: David S. Miller commit f02b16bea2d8411b21a531fc381e066985895387 Author: Michael S. Tsirkin Date: Mon Sep 26 21:12:26 2005 -0700 [IB] mthca: Round up number of slots in HCA context memory table When allocating a table for mem-free HCA context, don't assume that obj_size * nobj is an even multiple of MTHCA_TABLE_CHUNK_SIZE. In particular, make sure we allocate at least one slot even if the table is smaller than MTHCA_TABLE_CHUNK_SIZE. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 0b1556945475e8529328edf98ff0d201ed133edb Author: Al Viro Date: Mon Sep 26 07:49:27 2005 +0100 [PATCH] missing dependency on arm O= builds arm maketools needs include/asm-arm in place in the build tree. On normal builds it's always there, of course, but on O= it's created (by generic code) too late - when we get to asm-offset.h. We used to get away with that by accident - creation of include/asm-arm/arch symlink creates include/asm-arm and it happened to go before maketools. However, we did not have such dependency, so that luck didn't last - now maketools is picked first and we are screwed. Both the symlink and maketools are prerequisites of the same target (archprepare). This fix is obvious - make the latter explicitly depend on the former and be done with that. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a880948b2b88c05af9a471ca5c52883e64d3f7b8 Author: Al Viro Date: Mon Sep 26 06:19:28 2005 +0100 [PATCH] m32r: more basic __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c74dbac71419cdeaca8cd637ee666d6947961695 Author: Al Viro Date: Mon Sep 26 06:19:28 2005 +0100 [PATCH] m32r: set CHECKFLAGS properly We do _not_ need "sparse" in sparse arguments ;-) What we do need is __BIG_ENDIAN__; right now unconditional, when m32r starts using CPU_LITTLE_ENDIAN, we'll need to adjust. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 24558a0f7a00fccd19a6e6502956463f056ce90e Author: Al Viro Date: Mon Sep 26 06:19:28 2005 +0100 [PATCH] m32r: missing __iomem in ioremap() declaration Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ce3a161e693388aaa66d43d26156053311a39b7d Author: Al Viro Date: Mon Sep 26 05:49:44 2005 +0100 [PATCH] useless includes of linux/irq.h in arch/i386 Most of these guys are simply not needed (pulled by other stuff via asm-i386/hardirq.h). One that is not entirely useless is hilarious - arch/i386/oprofile/nmi_timer_int.c includes linux/irq.h... as a way to get linux/errno.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7625d483a454cbc8090c5d304eea0847210d6b99 Author: Al Viro Date: Mon Sep 26 05:25:59 2005 +0100 [PATCH] missing asm/irq.h (cs89x0) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0dc461069879b45a2d5333bd16990f8080a318fd Author: David S. Miller Date: Mon Sep 26 16:12:18 2005 -0700 [SPARC64]: Do not do TLB pre-filling any more. In order to do it correctly on UltraSPARC-III+ and later we'd need to add some complicated code to set the TAG access extension register before loading the TLB. Since this optimization gives questionable gains, it's best to just remove it for now instead of adding the fix for Ultra-III+ Signed-off-by: David S. Miller commit c5bd50a9533533d7b9ac3469fa679b2368e7e26c Author: David S. Miller Date: Mon Sep 26 16:06:03 2005 -0700 [SPARC64]: Simplify Spitfire D-cache page flush. It tries to batch up the tag loads and comparisons, and then the stores. And this is just complicated instead of efficient. Also, make the symbol of the Cheetah version more grepable. Signed-off-by: David S. Miller commit 188bab3ae0ed164bc18f98be932512d777dd038b Author: Harald Welte Date: Mon Sep 26 15:25:11 2005 -0700 [NETFILTER]: Fix invalid module autoloading by splitting iptable_nat When you've enabled conntrack and NAT as a module (standard case in all distributions), and you've also enabled the new conntrack netlink interface, loading ip_conntrack_netlink.ko will auto-load iptable_nat.ko. This causes a huge performance penalty, since for every packet you iterate the nat code, even if you don't want it. This patch splits iptable_nat.ko into the NAT core (ip_nat.ko) and the iptables frontend (iptable_nat.ko). Threfore, ip_conntrack_netlink.ko will only pull ip_nat.ko, but not the frontend. ip_nat.ko will "only" allocate some resources, but not affect runtime performance. This separation is also a nice step in anticipation of new packet filters (nf-hipac, ipset, pkttables) being able to use the NAT core. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit b85daee0e497c8fe7c4dc3531674ede645b37cdf Author: David S. Miller Date: Mon Sep 26 15:23:58 2005 -0700 [AF_PACKET]: Remove bogus checks added to packet_sendmsg(). These broke existing apps, and the checks are superfluous as the values being verified aren't even used. Signed-off-by: David S. Miller commit c62dba9011b93fd88fde929848582b2a98309878 Author: Herbert Xu Date: Mon Sep 26 15:10:16 2005 -0700 [IPV6]: Fix [Bug 5306] Oops on IPv6 route lookup > Steps to reproduce: > 1. Boot Linux, do NOT setup any IPv6 routes > 2. ip route get 2001::1 (or any unroutable address) Well caught. We never set rt6i_idev on ip6_null_entry. This patch should make the problem go away. Signed-off-by: Herbert Xu Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit acd042bb2de50d4e6fb969281a00cc8b8b71e46d Author: Evgeniy Polyakov Date: Mon Sep 26 15:06:50 2005 -0700 [CONNECTOR]: async connector mode. If input message rate from userspace is too high, do not drop them, but try to deliver using work queue allocation. Failing there is some kind of congestion control. It also removes warn_on on this condition, which scares people. Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit b9d717a7b413f227ebb2d61d9c118335f7292137 Author: Alex Williamson Date: Mon Sep 26 14:28:02 2005 -0700 [NET]: Make sure ctl buffer is aligned properly in sys_sendmsg(). It's on the stack and declared as "unsigned char[]", but pointers and similar can be in here thus we need to give it an explicit alignment attribute. Signed-off-by: Alex Williamson Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 63c47c286d062d93e0501d60797274c84a587e97 Author: Roland Dreier Date: Mon Sep 26 13:01:03 2005 -0700 [IB] uverbs: Close some exploitable races Al Viro pointed out that the current IB userspace verbs interface allows userspace to cause mischief by closing file descriptors before we're ready, or issuing the same command twice at the same time. This patch closes those races, and fixes other obvious problems such as a module reference leak. Some other interface bogosities will require an ABI change to fix properly, so I'm deferring those fixes until 2.6.15. Signed-off-by: Roland Dreier commit 819ccc86a43739e0cf443b6d6641a8722869be01 Author: Vincent Sanders Date: Mon Sep 26 19:52:57 2005 +0100 [ARM] 2936/1: ixp4xx default config fixes Patch from Vincent Sanders A recent patch which made IXP4xx mach_desc's depend on config options had the effect of not building the kernel for several machines it possibly could be, this patch updates the default config to ensure all possible machines are built for by default. Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 6132f9e146150473f803323dc8064a5506e33952 Author: David Vrabel Date: Mon Sep 26 19:52:56 2005 +0100 [ARM] 2935/1: ixp4xx: fix warnings in ixp4xx_set_irq_type Patch from David Vrabel Signed-off-by: David Vrabel Signed-off-by: Russell King commit 44dd823b00fa64bf01e53557d28555011f122a88 Author: Michael S. Tsirkin Date: Mon Sep 26 09:42:09 2005 -0700 [IB] mthca: Fix off by one bug in mthca_map_cmd The loop in mthca_map_cmd() would fill one entry past the end of the mailbox buffer before calling the firmware command. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit f7ed3a5971da98acdc506bdbdef25cfe51c334a2 Author: Michael S. Tsirkin Date: Mon Sep 26 09:29:33 2005 -0700 [IB] mthca: fix off by one in clr_int calculation We should use the first word of the clear interrupt register if the bit we're after is < 32, not < 31. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 018771f435388f22f388eb8658c652086fb3633e Author: Roland Dreier Date: Wed Sep 21 21:40:12 2005 -0700 [IB] mthca: Fix doorbell record resource leak If we allocate a bunch of doorbell records and then free them, we'll end up with completely empty pages, which we then free. However, when we come back to allocate more doorbell pages, we have to reallocate those empty pages rather than always trying to take a slot that we've never used. If we don't, we eventually use up every slot and fail to allocate a doorbell record, even though we have plenty of free space. Signed-off-by: Roland Dreier commit e2fcc61ef0d654887b651bd99ffcb52f7344b836 Author: Anton Altaparmakov Date: Mon Sep 26 17:02:41 2005 +0100 NTFS: Re-fix sparse warnings in a more correct way, i.e. don't use an enum with different types in it but #define the two constants instead. Signed-off-by: Anton Altaparmakov commit cbf8fd9f5aa5164e05cb04d4a34fcbe82f60beeb Author: Russell King Date: Mon Sep 26 15:30:20 2005 +0100 [ARM] Remove SA_IRQNOMASK SA_IRQNOMASK is unused, remove it. Signed-off-by: Russell King commit 4fb7edce52e5b6cf41e3375822d74a27f0b6f2dd Author: Kars de Jong Date: Sun Sep 25 14:39:46 2005 +0200 [PATCH] pcmcia: fix cross-platform issues with pcmcia module aliases - Added a missing TO_NATIVE call to scripts/mod/file2alias.c:do_pcmcia_entry() - Add an alignment attribute to struct pcmcia_device_no to solve an alignment issue seen when cross-compiling on x86 for m68k. Signed-off-by: Kars de Jong Signed-off-by: Dominik Brodowski commit 2570b746484cfddf4b7b4715dbb69d53d5284f4d Author: Dominik Brodowski Date: Sat Sep 17 11:17:56 2005 +0200 [PATCH] pcmcia: update ID for NinjaATA Christian Zoz reported there are multiple NinjaATA devices all sharing the second product ID string, but not the first one. Signed-off-by: Dominik Brodowski commit f9cb8b71e7d6c858b1afe665fd0a09169fdf4390 Author: Daniel Ritz Date: Sat Sep 24 23:12:46 2005 -0700 [PATCH] yenta: more ENE bridges Adds better support for the CB-710, CB-712, CB-720 and CB-722 bridges from EnE Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski commit a42f0dc4376fc574980864f890d1527894719cde Author: Dominik Brodowski Date: Sat Sep 24 23:12:44 2005 -0700 [PATCH] pcmcia: new IDs for serial_cs Add new ID to serial_cs.c; the CIS fimware override is available by the manufacturer at http://www.sierrawireless.com . Remember to name the CIS binary SW_7xx_SER.cis and to put it into /lib/firmware/ Signed-off-by: Dominik Brodowski commit 6c1a10dba92cbacb58563f5eacf93807125b488a Author: Daniel Ritz Date: Tue Sep 20 14:12:17 2005 -0700 [PATCH] yenta: add support for more TI bridges Support some more TI cardbus bridges. most of them are multifunction devices which adds 1394 controllers, smartcard readers etc. this could also help with the various problems with the XX21 controllers seen on the linux-pcmcia list. Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski commit 81000808b636b75a0ff5ef86c28f24fc6f5151eb Author: Komuro Date: Sat Sep 24 23:12:40 2005 -0700 [PATCH] pcmcia: fix Kconfig dependency TCIC depends on ISA. It is used with ISA-bus system only. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Dominik Brodowski commit 8e5d17ebe41eb98a538ef13aad36da5136701aab Author: Dominik Brodowski Date: Wed Sep 7 16:00:28 2005 -0700 [PATCH] yenta: tiny cleanup pci_set_power_state is not needed, as we call pci_enable_device() somewhere else. Also, the resource we write to PCI_BASE_ADDRESS_0 needs to be converted to bus-centric view first. Signed-off-by: Dominik Brodowski commit a413c09094e4df714c274690928dcf8125daf7e8 Author: Daniel Ritz Date: Wed Aug 24 17:03:23 2005 +0200 [PATCH] yenta: don't mess with bridge control register In interrupt probing (both ISA and PCI) the bridge control register is used to change interrupt routing to ISA or PCI by changing bit 7. But this bit only controls the routing of card functional interrupts, not the CSC interrupts which are used for interrupt probing. A bad side effect of messing with this register in yenta_probe_irq() is that it can lead to irq storms if a card is inserted and already powered by the BIOS. Usage in yenta_sock_init() and yenta_config_init() seem to be fishy as well. Signed-off-by: Daniel Ritz Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 8c3520d4eb3b1bbf2e45fbae8dcfb8db06d5e775 Author: Daniel Ritz Date: Sun Aug 21 22:29:26 2005 -0700 [PATCH] yenta: auto-tune EnE bridges for CardBus cards Echo Audio cardbus products are known to be incompatible with EnE bridges. in order to maybe solve the problem a EnE specific test bit has to be set, another cleared...but other setups have a good chance to break when just forcing the bits. so do the whole thingy automatically. The patch adds a hook in cb_alloc() that allows special tuning for the different chipsets. for ene just match the Echo products and set/clear the test bits, defaults to do the same thing as w/o the patch to not break working setups. Signed-off-by: Daniel Ritz Cc: Linus Torvalds Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 5a8c0cc32bb6e029cd9c36f655c6b0955b0d9967 Author: Anton Altaparmakov Date: Mon Sep 26 10:48:54 2005 +0100 NTFS: More $LogFile handling fixes: when chkdsk has been run, it can leave the restart pages in the journal without multi sector transfer protection fixups (i.e. the update sequence array is empty and in fact does not exist). Signed-off-by: Anton Altaparmakov commit 838bf9675a3d1ede01408aa105357b9ab43faf1b Author: Anton Altaparmakov Date: Mon Sep 26 10:45:46 2005 +0100 NTFS: Fix the definition of the CHKD ntfs record magic. It had an off by two error causing it to be CHKB instead of CHKD. Signed-off-by: Anton Altaparmakov commit 80dc0d6b44ce0f01df58d8899e46612690ed7d81 Author: David S. Miller Date: Mon Sep 26 00:32:17 2005 -0700 [SPARC64]: Probe D/I/E-cache config and use. At boot time, determine the D-cache, I-cache and E-cache size and line-size. Use them in cache flushes when appropriate. This change was motivated by discovering that the D-cache on UltraSparc-IIIi and later are 64K not 32K, and the flushes done by the Cheetah error handlers were assuming a 32K size. There are still some pieces of code that are hard coding things and will need to be fixed up at some point. While we're here, fix the D-cache and I-cache parity error handlers to run with interrupts disabled, and when the trap occurs at trap level > 1 log the event via a counter displayed in /proc/cpuinfo. Signed-off-by: David S. Miller commit 56425306517ef28a9b480161cdb96d182172bc1d Author: David S. Miller Date: Sun Sep 25 16:46:57 2005 -0700 [SPARC64]: Add CONFIG_DEBUG_PAGEALLOC support. The trick is that we do the kernel linear mapping TLB miss starting with an instruction sequence like this: ba,pt %xcc, kvmap_load xor %g2, %g4, %g5 succeeded by an instruction sequence which performs a full page table walk starting at swapper_pg_dir. We first take over the trap table from the firmware. Then, using this constant PTE generation for the linear mapping area above, we build the kernel page tables for the linear mapping. After this is setup, we patch that branch above into a "nop", which will cause TLB misses to fall through to the full page table walk. With this, the page unmapping for CONFIG_DEBUG_PAGEALLOC is trivial. Signed-off-by: David S. Miller commit 5b58745203f16ab83e50f4a015eea84c416d9279 Author: Ben Dooks Date: Sun Sep 25 23:04:48 2005 +0100 [ARM] 2934/1: Anubis - fix VA offsets for CPLD registers Patch from Ben Dooks The VA addresses of the Anubis CPLD registers confoict with the addresses for the ISA space maps used by the rest of the s3c2410 architecture Signed-off-by: Ben Dooks Signed-off-by: Russell King commit f04da5def8c460b1b52d3142da827ab01efa3a15 Author: Ben Dooks Date: Sun Sep 25 23:02:49 2005 +0100 [ARM] 2933/1: S3C2410 - fix serial port warnings Patch from Ben Dooks Fix the following warnings produced from drivers/char/s3c2410.c. drivers/serial/s3c2410.c:757: warning: 'clk' may be used uninitialized drivers/serial/s3c2410.c:756: warning: 'clksrc' may be used uninitialized Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 52f26deb7c67d5f34910660200b925c1a2b8df8c Author: David S. Miller Date: Sat Sep 24 23:06:14 2005 -0700 [SPARC64]: Fix mask formation in tomatillo_wsync_handler() "1" needs to be "1UL", this is a 64-bit mask we're creating. Signed-off-by: David S. Miller commit 8ddec7460d2f5db3ac35812c03676b1473d1d668 Author: Harald Welte Date: Sat Sep 24 16:56:08 2005 -0700 [NETFILTER] ip_conntrack: Update event cache when status changes The GRE, SCTP and TCP protocol helpers did not call ip_conntrack_event_cache() when updating ct->status. This patch adds the respective calls. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 8689c07e47e928f8e329f667df8cf697a37425dd Author: Alexey Dobriyan Date: Sat Sep 24 16:55:17 2005 -0700 [IRDA]: *irttp cleanup * Remove useless comment. * Remove useless assertions. * Remove useless comparison. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 15166fadb0308496bbff50c08ed5fe6a18d5cc4f Author: Alexey Dobriyan Date: Sat Sep 24 16:54:50 2005 -0700 [IRDA]: Fix memory leak in irttp_init() Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 45fc3b11f1d419ed6c636e5ca84472d9805f520e Author: Amos Waterland Date: Sat Sep 24 16:53:16 2005 -0700 [NET]: Protect neigh_stat_seq_fops by CONFIG_PROC_FS From: Amos Waterland If CONFIG_PROC_FS is not selected, the compiler emits this warning: net/core/neighbour.c:64: warning: `neigh_stat_seq_fops' defined but not used Which is correct, because neigh_stat_seq_fops is in fact only initialized and used by code that is protected by CONFIG_PROC_FS. So this patch fixes that up. Signed-off-by: Amos Waterland Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit d67b24c40f81823abe5c1eb808bba1038969142b Author: Harald Welte Date: Sat Sep 24 16:52:03 2005 -0700 [NETFILTER]: Fix ip[6]t_NFQUEUE Kconfig dependency We have to introduce a separate Kconfig menu entry for the NFQUEUE targets. They cannot "just" depend on nfnetlink_queue, since nfnetlink_queue could be linked into the kernel, whereas iptables can be a module. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit ff13f98b97cb6c5a2d201dfa4db0a2fd0b4d9d50 Author: Dmitry Torokhov Date: Sat Sep 24 02:02:29 2005 -0500 [PATCH] Input: check switch bitmap when matching handlers The wwitch bitmap was added to input_device_id structure and we should check it when matching handlers and input devices. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit d2f607484f8210cf19b1730dee26d426a5a770a5 Author: Russell King Date: Sat Sep 24 10:42:06 2005 +0100 [ARM] Fix compiler warnings for memcpy_toio/memcpy_fromio/memset_io Add 'volatile' to the __iomem pointers for these functions as per x86. Signed-off-by: Russell King commit 6b9ea4213e3a9c9b8de29a001a2b8d8799cbc1c9 Author: Russell King Date: Sat Sep 24 10:24:37 2005 +0100 [MFD] Fix "bious one-bit signed bitfield" errors ucb1x00-ts declared a couple of one-bit 'int' bitfields. Make them unsigned. Signed-off-by: Russell King commit f993724210744a9b07cf5496808828c4da6ab6df Author: Russell King Date: Sat Sep 24 10:12:47 2005 +0100 [SERIAL] Remove unused variable in clps711x.c Signed-off-by: Russell King commit c8868611389aa28e0e5e0d63f468727781eac68c Author: Stephen Hemminger Date: Fri Sep 23 09:08:30 2005 -0700 [PATCH] skge: fix Yukon-Lite A0 workaround This is one of those workarounds sucked over from sk98lin driver. The skge driver needs to detect the Yukon-Lite A0 chip properly, and turn of Rx FIFO Flush. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 73394322a4bf4108847ba3c2eee33a81b1b44450 Author: Russell King Date: Fri Sep 23 21:49:58 2005 +0100 [ARM] Fix context switch with ARMv6 + TLS We accidentally corrupted the TLS value when clearing out the ARMv6 exclusive monitor. Avoid doing so. Signed-off-by: Russell King commit dbdb90450059e17e8e005ebd3ce0a1fd6008a0c8 Author: Andrew Morton Date: Fri Sep 23 13:24:10 2005 -0700 [PATCH] revert oversized kmalloc check As davem points out, this wasn't such a great idea. There may be some code which does: size = 1024*1024; while (kmalloc(size, ...) == 0) size /= 2; which will now explode. Cc: "David S. Miller" Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86513e726b494796175b6c4fdd705797f01b0ca2 Author: Harald Welte Date: Fri Sep 23 13:24:10 2005 -0700 [PATCH] documentation: sparse no longer uses bk, but git Signed-off-by: Harald Welte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7c965084392e23a3494f0247c75795360a3fa0d Author: Hironobu Ishii Date: Fri Sep 23 13:24:08 2005 -0700 [PATCH] ipmi_msghandler: inconsistent spin_lock usage I found an inconsistent spin_lock usage in ipmi_smi_msg_received. Signed-off-by: Hironobu Ishii Cc: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67b108131df1230bad20a7279a8897de123d690b Author: Benjamin Herrenschmidt Date: Fri Sep 23 13:24:07 2005 -0700 [PATCH] ppc64: Fix huge pages MMU mapping bug Current kernel has a couple of sneaky bugs in the ppc64 hugetlb code that cause huge pages to be potentially left stale in the hash table and TLBs (improperly invalidated), with all the nasty consequences that can have. One is that we forgot to set the "secondary" bit in the hash PTEs when hashing a huge page in the secondary bucket (fortunately very rare). The other one is on non-LPAR machines (like Apple G5s), flush_hash_range() which is used to flush a batch of PTEs simply did not work for huge pages. Historically, our huge page code didn't batch, but this was changed without fixing this routine. This patch fixes both. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2601c2e278863cd48c01bce1377b4c9747893025 Author: Andrew Morton Date: Fri Sep 23 13:24:06 2005 -0700 [PATCH] atyfb c99 fix - fix this: drivers/video/aty/xlinit.c: In function `atyfb_xl_init': drivers/video/aty/xlinit.c:256: warning: ISO C90 forbids mixed declarations and code - repair some kooky coding style - Use ARRAY_SIZE() Cc: Tom 'spot' Callaway Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3b5f0d43863402b03b3af9a7eaec0037a823374 Author: Karsten Keil Date: Fri Sep 23 13:24:05 2005 -0700 [PATCH] hisax: remove URB_ASYNC_UNLINK usb_unlink_urb is always async now, so URB_ASYNC_UNLINK was removed from core USB and we must do as well. Signed-off-by: Karsten Keil Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 188a1eafa03aaa5e5fe6f53e637e704cd2c31c7c Author: Linus Torvalds Date: Fri Sep 23 13:22:21 2005 -0700 Make sure SIGKILL gets proper respect Bhavesh P. Davda noticed that SIGKILL wouldn't properly kill a process under just the right cicumstances: a stopped task that already had another signal queued would get the SIGKILL queued onto the shared queue, and there it would remain until SIGCONT. This simplifies the signal acceptance logic, and fixes the bug in the process. Losely based on an earlier patch by Bhavesh. Signed-off-by: Linus Torvalds commit 898cf0ecb7959db97d71cbce19685ce73a28d47c Author: David S. Miller Date: Fri Sep 23 11:59:44 2005 -0700 [SPARC64]: Mark functions called by paging_init() as __init. Signed-off-by: David S. Miller commit 1c9ea5db001142a96fec8fed0f92f26892a1b6ac Author: David S. Miller Date: Fri Sep 23 11:54:43 2005 -0700 [SPARC64]: Kill unused variable in setup_arch() 'highest_paddr' is set, but never actually used. Signed-off-by: David S. Miller commit ede1327ea4ca8019ec6df24b3e837def091c26b8 Author: Steve French Date: Tue Aug 30 20:10:14 2005 -0700 [PATCH] cifs: Add support for suspend cifsd had been preventing software suspend from completing. Signed-off-by: pavel@suse.de Signed-off-by: Steve French lightly modified Signed-off-by: Linus Torvalds commit 12f44f46bc9c6dc79255e661b085797af395d8da Author: Ivan Kokshaysky Date: Thu Sep 22 21:06:31 2005 -0700 [PATCH] pci: fixup parent subordinate busnr I believe the change that broke things is introduction of pci_fixup_parent_subordinate_busnr(). The patch here does two things: - hunk #1 should fix the problems you've seen when you boot without additional "pci" kernel options; - hunk #2 supposedly fixes boot with "pci=assign-busses" option which otherwise hangs Acer TM81xx machines as reported. Please try this with and without "pci=assign-busses". If it boots, I'd like to see 'lspci -vvx' for both cases. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 715dc636b64b57aee7aee7e8b5bf4f5267a6df48 Author: Anton Altaparmakov Date: Fri Sep 23 11:24:28 2005 +0100 NTFS: Change ntfs_cluster_free() to require a write locked runlist on entry since we otherwise get into a lock reversal deadlock if a read locked runlist is passed in. In the process also change it to take an ntfs inode instead of a vfs inode as parameter. Signed-off-by: Anton Altaparmakov commit 9389d79fbf9a0167ff2de87e8796c6bb803219bf Author: Paul Gortmaker Date: Fri Sep 23 05:18:45 2005 -0400 [PATCH] 8390 Tx fix for non i386 machines While this is true, E8390_CMD is zero on i386, and thus there should be no effect for these machines. Machines like Mac, Amiga etc. which use Alan's clever register mapping may have a non-zero E8390_CMD and result in bogus "transmitter busy" type messages from this bug. Fixes BUG# 3991. commit eb0e0076878a4f9e8e6e7e524ded0d6f7d4a6130 Author: Sridhar Samudrala Date: Thu Sep 22 23:48:38 2005 -0700 [SCTP]: Fix SCTP_SHUTDOWN notifications. Fix to allow SCTP_SHUTDOWN notifications to be received on 1-1 style SCTP SOCK_STREAM sockets. Add SCTP_SHUTDOWN notification to the receive queue before updating the state of the association. Signed-off-by: Sridhar Samudrala Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit 1dfbab59498d6f227c91988bab6c71af049a5333 Author: Harald Welte Date: Thu Sep 22 23:46:57 2005 -0700 [NETFILTER] Fix conntrack event cache deadlock/oops This patch fixes a number of bugs. It cannot be reasonably split up in multiple fixes, since all bugs interact with each other and affect the same function: Bug #1: The event cache code cannot be called while a lock is held. Therefore, the call to ip_conntrack_event_cache() within ip_ct_refresh_acct() needs to be moved outside of the locked section. This fixes a number of 2.6.14-rcX oops and deadlock reports. Bug #2: We used to call ct_add_counters() for unconfirmed connections without holding a lock. Since the add operations are not atomic, we could race with another CPU. Bug #3: ip_ct_refresh_acct() lost REFRESH events in some cases where refresh (and the corresponding event) are desired, but no accounting shall be performed. Both, evenst and accounting implicitly depended on the skb parameter bein non-null. We now re-introduce a non-accounting "ip_ct_refresh()" variant to explicitly state the desired behaviour. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a82b748930fce0dab22c64075c38c830ae116904 Author: Harald Welte Date: Thu Sep 22 23:45:44 2005 -0700 [NETFILTER] remove unneeded structure definition from conntrack helper Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 67497205b12e3cb408259cc09b50c3a9d12cd935 Author: Alexey Dobriyan Date: Thu Sep 22 23:45:24 2005 -0700 [NETFILTER] Fix sparse endian warnings in pptp helper Signed-off-by: Alexey Dobriyan Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 0ae5d253adcc467b1c52b512bbca9419eb438409 Author: Harald Welte Date: Thu Sep 22 23:44:58 2005 -0700 [NETFILTER] fix DEBUG statement in PPTP helper As noted by Alexey Dobriyan, the DEBUGP statement prints the wrong callID. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 2a7bc3c94cbca32d3d6e03e7d5a71662f591d28a Author: Vlad Drukker Date: Thu Sep 22 23:35:34 2005 -0700 [BRIDGE]: TSO fix in br_dev_queue_push_xmit Signed-off-by: Vlad Drukker Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 83ca28befc43e93849e79c564cda10e39d983e75 Author: Herbert Xu Date: Thu Sep 22 23:32:56 2005 -0700 [TCP]: Adjust Reno SACK estimate in tcp_fragment Since the introduction of TSO pcount a year ago, it has been possible for tcp_fragment() to cause packets_out to decrease. Prior to that, tcp_retrans_try_collapse() was the only way for that to happen on the retransmission path. When this happens with Reno, it is possible for sasked_out to become invalid because it is only an estimate and not tied to any particular packet on the retransmission queue. Therefore we need to adjust sacked_out as well as left_out in the Reno case. The following patch does exactly that. This bug is pretty difficult to trigger in practice though since you need a SACKless peer with a retransmission that occurs just as the cached MTU value expires. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit e484585ec3ee66cd07a627d3a9e2364640a3807f Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:29 2005 -0700 [PATCH] Add dm-snapshot tutorial in Documentation I've recently discovered the real functionality of device-mapper snapshots, and since they are not well known, I've decided to write some docs for them. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10d2c46f9408d404bffef89d5052953a3b1d9288 Author: Nick Wilson Date: Thu Sep 22 21:44:28 2005 -0700 [PATCH] NFS: fix client oops when debugging is on nfs_readpage_release() causes an oops while accessing a file with NFS debugging turned on (echo 32767 > /proc/sys/sunrpc/nfs_debug) and a kernel built with CONFIG_DEBUG_SLAB. This patch moves the debugging statement above nfs_release_request() to avoid accessing freed memory. Signed-off-by: Nick Wilson Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7b3a4359b25311fb5894c8809478a2df6bed480 Author: Rob Landley Date: Thu Sep 22 21:44:27 2005 -0700 [PATCH] Fix bd_claim() error code. Problem: In some circumstances, bd_claim() is returning the wrong error code. If we try to swapon an unused block device that isn't swap formatted, we get -EINVAL. But if that same block device is already mounted, we instead get -EBUSY, even though it still isn't a valid swap device. This issue came up on the busybox list trying to get the error message from "swapon -a" right. If a swap device is already enabled, we get -EBUSY, and we shouldn't report this as an error. But we can't distinguish the two -EBUSY conditions, which are very different errors. In the code, bd_claim() returns either 0 or -EBUSY, but in this case busy means "somebody other than sys_swapon has already claimed this", and _that_ means this block device can't be a valid swap device. So return -EINVAL there. Signed-off-by: Rob Landley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bdac5d1ed892da54b6b2069e50a47b3aa39460f Author: Glauber de Oliveira Costa Date: Thu Sep 22 21:44:26 2005 -0700 [PATCH] ext3: EXT3_DEBUG build fixes Fix some warnings and a build error when EXT3_DEBUG is enabled. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f65d9bea8692d7343e4636763f291408f025834f Author: Clemens Buchacher Date: Thu Sep 22 21:44:24 2005 -0700 [PATCH] oss: 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 288a60cf4d7cc35f84f46cd8ffd0b34f9d8e7346 Author: Chris Zankel Date: Thu Sep 22 21:44:23 2005 -0700 [PATCH] xtensa: remove io_remap_page_range and minor clean-ups Remove io_remap_page_range() from all of Linux 2.6.x (as requested and suggested by Randy Dunlap) and minor clean-ups. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fac97ae0b1a206e2952baf1f9eb46305d673adc6 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:22 2005 -0700 [PATCH] uml: replace printk with "stack-friendly" printf - to report console failure User get *a lot* confused when consoles don't work but we don't report anything. And, as reported in the comment, using printk to report "your console doesn't work" isn't likely to go that far. Fix the problem on the base of this: stack consumption by host printf(). Use kernel sprintf() and os_write_file, using a wild guess that one page will be enough for the message, to preallocate the buffer with kmalloc(). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79ae2cb856ed6a8c48f455d52d5ed5960c671e67 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:21 2005 -0700 [PATCH] uml: use GFP_ATOMIC for allocations under spinlocks. setup_initial_poll is only called with sigio_lock() held, so use appropriate allocation. Also, parse_chan() can also be called when holding a spinlock (see line_open() -> parse_chan_pair()). I have sporadic problems (spinlock taken twice, with spinlock debugging on UP) which could be caused by a sequence like "take spinlock, alloc and go to sleep, take again the spinlock in the other thread". Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46db4a42dd1190a311c2fb45106dfd0842c65a94 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:20 2005 -0700 [PATCH] uml: Fix GFP_ flags usage GFP_ATOMIC | GFP_KERNEL is meaningless and won't work. Actually it never worked, even in 2.4. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fea03cb40a15e3c6647c0927300202e062e6792a Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:20 2005 -0700 [PATCH] uml: avoid fixing faults while atomic Following i386, we should maybe refuse trying to fault in pages when we're doing atomic operations, because to handle the fault we could need to take already taken spinlocks. Also, if we're doing an atomic operation (in the sense of in_atomic()) we're surely in kernel mode and we're surely going to handle adequately the failed fault, so it's safe to behave this way. Currently, on UML SMP is rarely used, and we don't support PREEMPT, so this is unlikely to create problems right now, but it might in the future. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12ebcd73e40e0