ChangeSet@1.1887, 2004-08-03 00:50:08-07:00, benh@kernel.crashing.org [PATCH] ppc32: Fix problem with spurrious edge interrupts on old On old powermacs, it's possible that we get a stale edge interrupt when doing request_irq(), that typically happens with the DBDMA controller interrupts when the device was used by the firmware for booting. I just tracked down a nasty memory corruption problem where that was causing the bmac driver to try to process packets before the driver internal data structures were properly initialized. While I agree that the driver should (and will) be made more robust to such things, Paulus and I decided that it makes little sense to keep track of an "old" edge interrupt that happens before a driver does request_irq. (On those powermacs, those are only the DBDMA interrupts anyway, and none of the DBDMA users will care). This patch implements a "startup" handler for the old Apple PIC that will "ack" pending edge interrupts before unmasking, thus preventing those stale interrupts to be delivered. It also "fixes" the ppc32 irq core to call the startup() callback when available instead of just calling enable(). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds ChangeSet@1.1886, 2004-08-02 23:29:20-07:00, axboe@suse.de [PATCH] bio_copy_user() cleanups and fixes blk_rq_map_user() is a bit of a hack currently, since it drops back to kmalloc() if bio_map_user() fails. This is unfortunate since it means we do no real segment or size checking (and the request segment counts contain crap, already found one bug in a scsi lld). It's also pretty nasty for > PAGE_SIZE requests, as we attempt to do higher order page allocations. Even worse still, ide-cd will drop back to PIO for non-sg/bio requests. All in all, very suboptimal. This patch adds bio_copy_user() which simply sets up a bio with kernel pages and copies data as needed for reads and writes. It also changes bio_map_user() to return an error pointer like bio_copy_user(), so we can return something sane to the user instead of always -ENOMEM. Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1878.1.1, 2004-08-02 19:53:21-07:00, galak@somerset.sps.mot.com [PATCH] ppc32: fix e500 SPE saving of context Fix the fact that we were not the signal processing engine status and control register (SPEFSCR) on giveup_spe. Causes problems when the kernel tries to read or modify the SPEFSCR. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1884, 2004-08-02 17:05:45-07:00, shemminger@osdl.org [TCP]: BIC tcp congestion calculation timestamp Small change to bictcp based on the BIC 1.1 patches for web100. Keep track of last time congestion was computed, and recompute if cwnd changes or every 1/32 of a second. Also changes the initialization location for the parameters. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1883, 2004-08-02 17:04:02-07:00, herbert@gondor.apana.org.au [IPSEC]: Move xfrm[46]_tunnel_check_size into xfrm[46]_output.c This patch moves xfrm[46]_tunnel_check_size() into xfrm[46]_output.c where it can be made static since it's only used there. While moving the icmp.h inclusions over I also discovered that the tunnel files are missing an inclusion of net/protocol.h. So I've added them as well. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1882, 2004-08-02 16:58:10-07:00, herbert@gondor.apana.org.au [IPSEC]: Remove unnecessary inet_ecn.h inclusions This is a couple of clean-ups stemming from the xfrm_output change. I should've removed the inet_ecn.h inclusions in that change as the ECN code has been moved to xfrm[46]_output.c. This patch does exactly that. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1881, 2004-08-02 16:56:51-07:00, suckfish@ihug.co.nz [IPV6]: Trivial fix for ipv6_addr_hash() ipv6_addr_hash doesn't do what it's comment says. The comment was probably what was intended, not that it'll make much difference in practice. Signed-off-by: Ralph Loader Signed-off-by: Yoshifuji Hideaki Signed-off-by: David S. Miller ChangeSet@1.1880, 2004-08-02 16:55:00-07:00, akpm@osdl.org [BRIDGE]: Build fix for gcc-2.95.x gcc-2.95.c does not support anonymous unions. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1878, 2004-08-02 14:01:50-07:00, hirofumi@mail.parknet.co.jp [PATCH] FAT: kill nls default Previously, fatfs was using NLS_DEFAULT if users didn't specify the codepage or iocharset option. This became cause of trouble (filename access). This patch removes the complicated default config in kernel. Instead of it, by default, fatfs uses builtin nls ("default"), also reports it and mounts as read-only. This default will limit the access more or less. Note: If peoples want to write on this default, it still can switch by remount. Therefore, basically users will need to specify mount options always. ("codepage" for msdos, and "codepage" and "iocharset" for vfat) However, it can be done simply by script or shell alias or something else in userland. Thanks to Andries Brouwer for your many advice. Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1877, 2004-08-02 10:31:12-07:00, michael.kerrisk@gmx.net [PATCH] Off-by-one error for SIGXCPU / RLIMIT_CPU checking There is a lonstanding off-by-one error that results from an incorrect comparison when checking whether a process has consumed CPU time in excess of its RLIMIT_CPU limits. This means, for example, that if we use setrlimit() to set the soft CPU limit (rlim_cur) to 5 seconds and the hard limit (rlim_max) to 10 seconds, then the process only receives a SIGXCPU signal after consuming 6 seconds of CPU time, and, if it continues consuming CPU after handling that signal, only receives SIGKILL after consuming 11 seconds of CPU time. The fix is trivial. Signed-off-by: Linus Torvalds ChangeSet@1.1876, 2004-08-02 10:30:45-07:00, armin@melware.de [PATCH] ISDN Eicon driver: use msleep() Author: Armin Schindler, Nishanth Aravamudan Use kernel provided msleep() instead of own sleep implementation. Signed-off-by: Linus Torvalds ChangeSet@1.1875, 2004-08-02 10:16:52-07:00, axboe@suse.de [PATCH] fix cdrom cdda rip single frame dma fall back There's a stupid error in the fall back logic, it fails to increment the user pointer so the wave file is corrupt. We should also clear last_sense just to be sure. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds ChangeSet@1.1874, 2004-08-02 10:15:19-07:00, SteveD@redhat.com [PATCH] nsf4 oops fixes Here are some oops I found in error paths in the mounting pathes while debugging something else... I sent it out a while ago, but it didn't seem to get any traction.... The nfs_fill_super() fix is obvious and in nfs4_fill_super(), the server->client ptr needs to be set before the cl_idmap check, since rpc_shutdown_client() needs it when the check fails. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1873, 2004-08-02 10:15:07-07:00, bgerst@quark.didntduck.org [PATCH] Remove symbol_is() Remove the unused symbol_is() macro. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1872, 2004-08-02 10:14:55-07:00, bunk@fs.tum.de [PATCH] Canonically reference files in Documentation/ code comments part Below is a patch by Hans Ulrich Niedermann to change all references in comments to files in Documentation/ to start with Documentation/ Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1871, 2004-08-02 10:14:39-07:00, bunk@fs.tum.de [PATCH] remove outdated reference to Documentation/arm/SA1100/PCMCIA This file does not exist in 2.6. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1870, 2004-08-02 10:14:28-07:00, bjorn.helgaas@hp.com [PATCH] HPET copyrights, cleanup This patch - adds copyright and license info - changes sense of mmap config option (setting option enables mmap instead of disabling it, to avoid the double negative) - removes an #ifdef CONFIG_IA64 now that acpi_register_gsi() is generic. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1869, 2004-08-02 10:14:16-07:00, ak@suse.de [PATCH] Documentation fix for NMI watchdog Sync nmi_watchdog.txt with reality on x86-64. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1868, 2004-08-02 10:14:04-07:00, arnd@arndb.de [PATCH] DVB: "errno" undefined Actually, the problem has its origin in my removal of all in-kernel syscalls (except execve, which is non-trivial) earlier this year. This change was blindly reverted by the maintainer, while at the same time the local errno variable was removed. See also http://linux.bkbits.net:8080/linux-2.5/hist/drivers/media/dvb/frontends/tda= 1004x.c This patch is the one that was already merged earlier. I'm now also removing the definitions for the kernel syscalls on i386 to make it harder to reintroduce them again. This was already done for ppc64, the others should probably follow. Signed-off-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1867, 2004-08-02 10:13:52-07:00, paulus@samba.org [PATCH] PPC8xx Maintainer patch Tom is looking after PPC8xx and the PPC boot code. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1866, 2004-08-02 10:13:41-07:00, hch@lst.de [PATCH] Fix modular anscd Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1865, 2004-08-02 10:13:29-07:00, hch@lst.de [PATCH] modular swim3 ACKed by the pmac folks a while ago. Also moves the Kconfig entry to where it belongs. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1864, 2004-08-02 10:13:18-07:00, alan@lxorguk.ukuu.org.uk [PATCH] fdomain_cs ISA fix Revert the recent fdomain_cs config dependency "fix" and fix the linkage error with ifdeffery instead. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1863, 2004-08-02 10:13:08-07:00, macro@linux-mips.org [PATCH] MAINTAINERS update Maciej has moved. Signed-off-by: Maciej W. Rozycki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1862, 2004-08-02 10:12:56-07:00, bjorn.helgaas@hp.com [PATCH] rename CONFIG_PCI_USE_VECTOR to CONFIG_PCI_MSI The "vector" terminology is architecture-dependent. The PCI MSI interface actually deals with Linux IRQ numbers (i.e., things you can pass to request_irq()), and we shouldn't confuse things by calling them "vectors" just because we're using MSI rather than an IOSAPIC. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1861, 2004-08-02 10:12:44-07:00, roland@topspin.com [PATCH] MSI: MSI/MSI-X API updates Second half of MSI rewrite: fix the API and update documentation. Split enabling MSI and MSI-X to separate pci_enable_msi()/pci_disable_msi() and pci_enable_msix()/pci_disable_msix() functions. free_irq() no longer has the side effect of freeing interrupt vectors (so a device driver can do multiple request_irq()/free_irq() cycles on the same MSI/MSI_X vector). From: Tom L. Nguyen Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1860, 2004-08-02 10:12:32-07:00, roland@topspin.com [PATCH] MSI: stop using dev->bus->ops directly in msi.c First half of the MSI rewrite: pure cleanup. Use proper pci_read_config_xxx() and pci_write_config_xxx() functions instead of accessing raw dev->bus->ops. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1859, 2004-08-02 10:12:21-07:00, jbarnes@engr.sgi.com [PATCH] quieten down per-zone memory stats On a system with a lot of nodes, 4 lines of output per node is a lot to have to sit through as the system comes up, especially if you're on the other end of a slow serial link. The information is valuable though, so keep it around for the system logger. This patch makes the printks for the memory stats use KERN_DEBUG instead of the default loglevel. Signed-off-by: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1858, 2004-08-02 10:12:09-07:00, adobriyan@mail.ru [PATCH] Fix menuconfig partial inability to show help texts. Fix menuconfig inability to show help texts when there is menu item with letter "H" highlighted on the screen. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1857, 2004-08-02 10:11:57-07:00, akpm@osdl.org [PATCH] oom-killer: call show_free_areas Change the oom-killer so that it spits a sysrq-m output into the logs, and shows the gfp_mask of the failing allocation attempt. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1856, 2004-08-02 10:11:45-07:00, galak@somerset.sps.mot.com [PATCH] ppc32: support for MPC8555 CPU and board The following patch adds completes the CPU support for the MPC8555 PowerPC. Additionally, it adds support for the MPC8555 CDS reference board. This is another PowerPC in the Freescale MPC85xx family. * Add support for MPC8555 CPU and reference board Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1855, 2004-08-02 10:11:33-07:00, galak@somerset.sps.mot.com [PATCH] ppc32: Support for MPC8560 CPU and boards The following patch adds completes the CPU support for the MPC8560 PowerPC. Additionally, it adds support for the MPC8560 ADS reference board and fixes up some build issues with the SBC8560 board. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1854, 2004-08-02 10:11:20-07:00, david@gibson.dropbear.id.au [PATCH] ppc64: remove #include processor.h from div64.S This patch removes a redundant #include of processor.h from arch/ppc64/boot/div64.S. I came across this because, at least with the binutils versions I have currently installed, the 32-bit assembler used for the bootstrap code objects to the // comments that recently went into processor.h. Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1853, 2004-08-02 10:11:09-07:00, paulus@samba.org [PATCH] ppc64: improve SLB reload Rewrite/cleanup of the SLB management code. This removes nearly all the SLB related code from arch/ppc64/kernel/stab.c and puts a rewritten version in arch/ppc64/mm, where it better belongs. The main SLB miss path is in assembler and the other routines have been cleaned up and streamlined. Notable changes: - Ugly bitfields no longer used for generating SLB entries. - slb_allocate() (the main SLB miss routine) is now in assembler, and all the data it uses is stored in the PACA. - The mm context is now copied into the PACA at context switch time, to avoid looking up the thread struct on SLB miss. - An SLB miss will now never (directly) result in a call to do_page_fault. If we get a miss on a totally bogus address the handler will now put in an SLB referencing VSID 0. This will never have any pages, so we'll get the (fatal) page fault shortly afterwards. This simplifies the SLB entry and exit paths. - The round-robin pointer in the PACA now references the last-used instead of next-to-use SLB slot, which simplifies the asm for updating it slightly. - Unify do_slb_bolted with the general SLB miss path. There is now one SLB miss handler, in assembler, and called with only the low-level exception prolog (EXCEPTION_PROLOG_[PI]SERIES rather than EXCEPTION_PROLOG_COMMON) and minimal extra save/restore logic. - Streamlines the exception entry/exit path of the SLB miss handler to shave a few cycles off. The most significant change is that the RI bit is left off throughout the whole handler, which avoids an extra mtmsrd to turn it back off on the exit path. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1852, 2004-08-02 10:10:56-07:00, vatsa@in.ibm.com [PATCH] ppc64: Fix cpu_up race Patch below fixes a cpu_up race in PPC64. Signed-off-by: Srivatsa Vaddagiri Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1851, 2004-08-02 10:10:45-07:00, anton@samba.org [PATCH] ppc64: fix hotplug irq migration code In migrate_irqs_away we werent converting a virtual irq to a real one. We ended up passing the wrong irq numbers to the hypervisor and migration of affinitised irqs on cpu hot unplug didnt work. Also clarify the rtas_stop_self printk. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1850, 2004-08-02 10:10:34-07:00, david@gibson.dropbear.id.au [PATCH] ppc64: fix RAS irq handlers Both arch/ppc64/kernel/ras.c and arch/ppc64/kernel/rtasd.c have a spinlock variable declared static called "log_lock". Since the code in these files interact quit a lot, having two different locks with identical names is manifestly confusing. This patch renames both locks to something a little clearer. In the case of ras.c it also renames the buffer protected by the lock to a more usefullly greppable name. Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1849, 2004-08-02 10:10:22-07:00, paulus@samba.org [PATCH] ppc64: ISA device tree node refcount fix Moves a misplaced of_node_put(). In the existing code, the node in question is used just after its refcount is decremented. Signed-off-by: John Rose Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1848, 2004-08-02 10:10:10-07:00, johnrose@austin.ibm.com [PATCH] ppc64: struct pci_controller cleanup The patch below removes the unused member "pci_io_offset" from struct pci_controller. If there are no problems, please apply. Signed-off-by: John Rose Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1847, 2004-08-02 10:09:59-07:00, haveblue@us.ibm.com [PATCH] ppc64: fix off-by-one in mem_init() lmb_end_of_DRAM() returns the address of the end of RAM, not the starting address of the last page. We've been accessing mem_map[] out of bounds for quite a while. But, it's just a read, so it's probably never caused a real problem. But, during my port of CONFIG_NONLINEAR to ppc64, I have a check to make sure that all __va() calls are given with valid physical addresses. This code tripped that check. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1846, 2004-08-02 10:09:48-07:00, haveblue@us.ibm.com [PATCH] ppc64: __make_room() warning fix arch/ppc64/kernel/prom.c: In function `__make_room': arch/ppc64/kernel/prom.c:1415: warning: unused variable `offset' Signed-off-by: Dave Hansen Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1845, 2004-08-02 10:09:36-07:00, tim@physik3.uni-rostock.de [PATCH] Fix BSD accounting cross-platform compatibility BSD accounting cross-platform compatibility is a new feature of 2.6.8 and thus not crucial, but it'd be nice not to have kernels writing wrong file formats out in the wild. The endianness detection logic I wanted to suppose for userspace turned out to be bogus. So just do it the simple way and store endianness info together with the version number. Signed-off-by: Tim Schmielau Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1844, 2004-08-02 10:09:24-07:00, anton@samba.org [PATCH] sched: use for_each_cpu The per cpu schedule counters need to be summed up over all possible cpus. When testing hotplug cpu remove I saw the sum of the online cpu count for nr_uninterruptible go negative which made the load average go nuts. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1843, 2004-08-01 20:43:47-07:00, benh@kernel.crashing.org [PATCH] ppc32: Workaround new MPC745x CPU erratas The latest versions of Motorola erratas for the MPC745x CPUs (and 744x) adds a couple of nasty ones for which we really want workarounds in the kernel. One is to disable the BTIC branch target cache on some revs (too bad for performances...) and the other one is to force cacheable memory pages to always be marked as SMP coherent even on UP systems (I didn't measure significant perfs impact with this one). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds ChangeSet@1.1840.2.2, 2004-08-01 19:13:24-07:00, laforge@netfilter.org [NETFILTER]: Fix compilation of ip_nat_snmp_basic.c Please sumbit before 2.6.8-final, this just moves some code in order to make gcc happy. Thanks! Signed-off-by: Adrian Bunk Signed-off-by: Harald Welte Signed-off-by: David S. Miller ChangeSet@1.1840.2.1, 2004-08-01 19:10:04-07:00, bunk@fs.tum.de [NET]: Update NET_SCH_NETEM Kconfig help text. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller ChangeSet@1.1840.1.1, 2004-08-01 18:46:07-07:00, davem@nuts.davemloft.net Merge conflicts. ChangeSet@1.1814.5.1, 2004-08-01 14:57:26-04:00, chrisw@osdl.org [PATCH] ethtool_get_regs copy right number of bytes to user If regs.len is smaller than reglen it's possible to copy more bytes out than the user asked for. Signed-off-by: Chris Wright ChangeSet@1.1839, 2004-07-31 23:41:30-07:00, ahu@ds9a.nl [IPSEC]: Fix UDP decap code. The missing break causes the packet to be tested against both encapsulation types, one will always fail. Signed-off-by: bert hubert Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1838, 2004-07-31 23:39:29-07:00, herbert@gondor.apana.org.au [PF_KEY]: spirange should be in host byte order. I'm looking through the xfrm_alloc_spi stuff and noticed that the netlink alloc_spi function takes the range in host order while the PFKEY alloc_spi function takes them in network order. First I thought that I stuffed up since I was the one who changed the code in the netlink interface to take them in host order :) But reading RFC 2367 seems to indicate otherwise. It says that all fields are host order unless specified otherwise. And the spirange fields are not specified to be network order at all. Looking at the existing PFKEY users: User Space ---------- Openswan - Doesn't use PFKEY for this. Racoon - Puts zeros in there so it doesn't care. However its test-pfkey program stores things in host order. ISAKMPD - Stores things in host order. So the conclusion is that we can and should change our PFKEY implementation to use host order for these fields. This patch does exactly that. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1837, 2004-07-31 23:33:16-07:00, herbert@gondor.apana.org.au [IPSEC]: xfrm_alloc_spi always succeeds on non-trivial range xfrm_alloc_spi will always succeed if minspi < maxspi, even if minspi + 1 == maxspi. If the range is already occupied this will obviously lead to breakage. Of course this is very unlikely to occur in reality due to the size of the range. Although with IPCOMP it might actually happen on a very large server. The fix is obivous. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1836, 2004-07-31 23:30:00-07:00, herbert@gondor.apana.org.au [IPSEC]: Remove redundant check in xfrm_state_add() This is the patch referred to in the netlink_get_spi thread. I was actually wrong about the reason for this patch though. Firstly it's the SPI check that is redundant and not the find_acq() call. And it's redundant because of the find_acq() patch, not because of the fact that this is in xfrm_state_add(). Now that find_acq() only returns SAs with SPIs, we don't need to check this in xfrm_state_add() anymore. We do still need the call though to clean up leftover larval states. Another side-effect of the change is that we can move the existence check above find_acq() since find_acq() will never return any SAs matching the SPI we're trying to add (It doesn't need to because if an SA with a matching SPI existed, it would've been returned by state_lookup() already). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1835, 2004-07-31 23:28:27-07:00, herbert@gondor.apana.org.au [IPSEC]: Fix SPI generation by netlink_get_spi() The issue is that two successive calls to netlink_get_spi is returning the same SA. Since netlink_get_spi is meant to be a creation operation this is incorrect. The netlink_get_spi operation is modelled off the PFKEY SADB_GETSPI command which is specified in RFC 2367. The purpose of SADB_GETSPI is to create a new larval SA that can then be filled in by SADB_UPDATE. Its semantics does not allow two SADB_GETSPI calls to return the same SA, even if there is no SADB_UPDATE call in between. The reason the second netlink_get_spi is returning the same SA is because in find_acq(), the code is looking at all larval states as opposed to only larval states with an SPI of zero. Since the only other caller of find_acq() -- xfrm_state_add() intentionally ignores all return values with a non-zero SPI, it is safe to not look at SAs with non-zero SPIs at all in find_acq(). The following patch does exactly that. In fact, the find_acq() call in xfrm_state_add() is a remnant from the days when we had xfrm_state_replace() instead of xfrm_state_add() and xfrm_state_update(). It can now be safely removed. I'll post a separate patch for that. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1834, 2004-07-31 23:24:50-07:00, davem@nuts.davemloft.net Merge http://linux-mh.bkbits.net/bluetooth-2.6 into nuts.davemloft.net:/disk1/BK/net-2.6 ChangeSet@1.1830.1.23, 2004-07-31 23:49:12-07:00, jmorris@redhat.com [CRYPTO]: Add i586 optimized AES Below is an updated version of patch from Fruhwirth which integrates the Gladman AES code into the crypto API. I've tried to ensure that this is done as simply as possible: the user gets the asm version by default if it's suitable. I've also now added the alternate GPL licensing provided by Brian Gladman, and licensed the code as GPL. Signed-off-by: James Morris Signed-off-by: David S. Miller ChangeSet@1.1833, 2004-07-31 23:20:16-07:00, davem@nuts.davemloft.net Merge nuts.davemloft.net:/disk1/BK/network-2.6 into nuts.davemloft.net:/disk1/BK/net-2.6 ChangeSet@1.1830.1.20, 2004-08-01 01:54:08-05:00, stevef@steveft21.ltcsamba [CIFS] Update readme and todo lists for cifs vfs Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.1830.4.4, 2004-07-31 18:34:32-07:00, alan@redhat.com [PATCH] PATCH: Fix HPT366 crash and support HPT372N On a board containing the HPT372N IDE controller the 2.6.x series kernels will misbehave. If the HPT372N is set up with the newer PCI identifier it is ignored. If it is set up with the HPT372 identifier then the kernel crashes on boot. This patch is a forward port of my 2.4 driver fixes that have been in 2.4 for a year but somehow escaped 2.6. Ronny Buchmann caught a couple of merge details I missed and those are fixed in this diff too. As well as adding 372N support this also fixes the unknown revision case to avoid crashes should any future 37x variants with weird class_rev's appear Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds ChangeSet@1.1830.4.3, 2004-07-31 14:47:41-07:00, akpm@osdl.org [PATCH] slab memory shrinking balancing fix The logic in shrink_slab tries to balance the proportion of slab which it scans against the proportion of pagecache which the caller scanned. Problem is that with a large number of highmem LRU pages and a small number of lowmem LRU pages, the amount of pagecache scanning appears to be very small, so we don't push slab hard enough. The patch changes things so that for, say, a GFP_KERNEL allocation attempt we only consider ZONE_NORMAL and ZONE_DMA when calculating "what proportion of the LRU did the caller just scan". This will have the effect of shrinking slab harder in response to GFP_KERNEL allocations than for GFP_HIGHMEM allocations. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1830.4.2, 2004-07-31 14:06:38-07:00, trini@kernel.crashing.org [PATCH] ppc32: fix compilation with binutils-2.15 Currently, ppc32 will not always compile with binutils-2.15. The issue is that binutils has become even more strict about which opcodes can be used with which CPU flags. The problem is that we have a number of cases where we compile with altivec instructions (with runtime checks to make sure we can actually run them) in code that's not altivec specific. The fix for this is to always pass in -maltivec on CONFIG_6xx. To do this cleanly, we split our AFLAGS definition up into aflags-$(CONFIG_FOO). Signed-off-by: Tom Rini Signed-off-by: Linus Torvalds ChangeSet@1.1830.4.1, 2004-07-31 09:49:53-07:00, torvalds@ppc970.osdl.org Merge bk://linux-sam.bkbits.net/kbuild into ppc970.osdl.org:/home/torvalds/v2.6/linux ChangeSet@1.1722.175.17, 2004-07-31 18:32:50+02:00, marcel@holtmann.org [Bluetooth] Fix resetting to default filters The problem is that after a successful connection between the Windows Bluetooth stack and the Linux Bluez stack, no packets from the device ever reach the PC running Windows XP Service Pack 2. That is, a ping from the PC never receives a response, and a ping from BlueZ never reaches the PC. Linux packet statistics show that the PC packets are received, but all return traffic seems to be routed over the loopback interface. Immediately after creating the BNEP connection with BlueZ, the Windows Bluetooth stack sends a BNEP_FILTER_NET_TYPE_SET_MSG with an effective length of zero. BlueZ interprets this message to mean that no filter ranges should be allowed. The code zeros the first entry in the filter list, which is than interpreted as meaning that no ranges of acceptable packets are available. This interpretation is wrong and leads to all packets being rejected by BNEP. The Bluetooth BNEP specification clearly states the following: The length (in octets) of this message is 4+4*N, where N is the number of disjoint ranges of Networking protocol types that form the complete set. Note that N=0 (empty set) denotes a reset to default filters (if any) supported by the remote device. Signed-off-by: Marcel Holtmann ChangeSet@1.1722.175.16, 2004-07-31 12:59:54+02:00, marcel@holtmann.org [Bluetooth] Send HCI_Reset for ISSC USB dongles For the USB dongles from ISSC the first command must be a HCI_Reset, because otherwise the inquiry procedures won't work. Signed-off-by: Marcel Holtmann ChangeSet@1.1830.1.18, 2004-07-30 22:49:36-07:00, viro@www.linux.org.uk [PATCH] sparse: misc cleanups all sorts of minor stuff - basically, all chunks are independent here, but IMO that one is not worth splitting. Contains: * pmac_cpufreq.c: declaration in the middle of a block. * sys_ia32.c: couple of trivial annotations. * ipmi_si_intf.c: should be using asm/irq.h instead of linux/irq.h * synclink_cs.c: assignment-in-conditional with nobody ever looking at the variable we are assigning to afterwards; variable removed. * sbni.c: s/__volatile/__volatile__ * matroxfb_base.h: got rid of ((u32 *)p)++ * asm-ppc/checksum.h and asm-sparc64/floppy.h: NULL noise removal * amd64 compat.h: missing L in long constant. * mtd-abi.h: annotated ioctl structure * sysctl.c: corrected annotations in extern Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.17, 2004-07-30 22:49:25-07:00, viro@www.linux.org.uk [PATCH] signed char portability fix code using atm_cirange fields assumes that they are signed; make that explicit by s/char/signed char/. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.16, 2004-07-30 22:49:13-07:00, viro@www.linux.org.uk [PATCH] size_t portability fixes more size_t fixes (%d -> %zd) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.15, 2004-07-30 22:49:02-07:00, viro@www.linux.org.uk [PATCH] sparse: more in drivers/net drivers/net BROKEN_ON_SMP annotations and NULL noise removals. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.14, 2004-07-30 22:48:50-07:00, viro@www.linux.org.uk [PATCH] sparse: more in isdn annotations and NULL noise removals in drivres/isdn (more BROKEN_ON_SMP stuff) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.13, 2004-07-30 22:48:39-07:00, viro@www.linux.org.uk [PATCH] ARM initial annotations Usual set of initial annotations for a platform. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.12, 2004-07-30 22:48:27-07:00, viro@www.linux.org.uk [PATCH] #if abuses Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.11, 2004-07-30 22:48:16-07:00, viro@www.linux.org.uk [PATCH] NULL noise removal in skfp Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.10, 2004-07-30 22:48:04-07:00, viro@www.linux.org.uk [PATCH] sparse: drivers/char/* the rest of BROKEN_ON_SMP drivers in drivers/char sparsified. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.9, 2004-07-30 22:47:52-07:00, viro@www.linux.org.uk [PATCH] sparse: stallion stallion annotated, cleaned up, a bunch of useless verify_area() removed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.8, 2004-07-30 22:47:40-07:00, viro@www.linux.org.uk [PATCH] sparse: istallion istallion annotated, cleaned up, a bunch of useless verify_area() removed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.7, 2004-07-30 22:47:29-07:00, viro@www.linux.org.uk [PATCH] sparse: ftape ftape got annotations and NULL noise removals. Propagated the dependency on alpha/i386/amd64 to Kconfig (it's already enforced by #error) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.6, 2004-07-30 22:47:17-07:00, viro@www.linux.org.uk [PATCH] annotations in drivers/video Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.1.5, 2004-07-30 22:47:05-07:00, viro@www.linux.org.uk [PATCH] inline fixes in net/* * in ipv6/route.c: made ipv6_advmss() inlined again (and moved it up) * in sunrpc/xprt.c: inlining fix: moved do_xprt_reserve() up Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1830.3.1, 2004-07-30 21:10:05-05:00, stevef@smfhome.smfdom [CIFS] remove sparse pointer warning Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.1830.1.4, 2004-07-30 19:07:42-07:00, torvalds@ppc970.osdl.org Merge bk://linux-dj.bkbits.net/agpgart into ppc970.osdl.org:/home/torvalds/v2.6/linux ChangeSet@1.1832, 2004-07-30 14:23:29-07:00, davem@nuts.davemloft.net [NET]: Kill NET_FASTROUTE, does nothing and suffers from major bitrot. Based up suggestion/changes from Jeff Garzik. Signed-off-by: David S. Miller ChangeSet@1.1830.2.2, 2004-07-30 21:11:13+00:00, holt@sgi.com bte_error.c: bte.c: After working with the chip designer some more, we have determined one more hardware register we were supposed to write to ensure the SHUB chip was ready for future transfers. This patch fixes that. This also allowed us to eliminate a udelay which was working around the problem. During retesting, we uncovered a race condition where transfer status was changed by a different cpu after we were expecting one value which cascaded to additional problems. This patch uses a local variable to also eliminate that race. Signed-off-by: Robin Holt Signed-off-by: Tony Luck ChangeSet@1.1830.1.2, 2004-07-30 13:50:04-07:00, davem@nuts.davemloft.net [SPARC64]: Update defconfig. ChangeSet@1.1830.2.1, 2004-07-30 20:26:30+00:00, pfg@sgi.com sn_console.c: move sn_debug_printf to only compile for DEBUG early printk needs to handle missing carriage returns Signed-off-by: Pat Gefre Signed-off-by: Tony Luck ChangeSet@1.1831, 2004-07-30 13:00:42-07:00, davem@nuts.davemloft.net Merge nuts.davemloft.net:/disk1/BK/network-2.6 into nuts.davemloft.net:/disk1/BK/net-2.6 ChangeSet@1.1829, 2004-07-29 22:48:53-07:00, viro@www.linux.org.uk [PATCH] cmap annotations fb_set_cmap() and fb_copy_cmap() split into kernel and userland versions. fb_cmap, fb_image and fb_cursor split and annotated. fixed bug in sbuslib.c that used to call "userland" version of fb_set_cmap() when kernel one was need (RGB data was already copied into kernel space). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1828, 2004-07-29 22:48:40-07:00, viro@www.linux.org.uk [PATCH] fb_cursor() fixes Massive leaks fixed in fb_cursor(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1827, 2004-07-29 22:48:29-07:00, viro@www.linux.org.uk [PATCH] console_font_op annotated ->vc_font switched to console_font (from console_font_op, of all things!) console_font_op annotated (->data is finally makred __user). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1826, 2004-07-29 22:48:17-07:00, viro@www.linux.org.uk [PATCH] con_get_font sanitized ->con_font_get() sanitized. We pass console_font * to method instead of console_font_op * and do not mess with mixing ->data in these guys. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1825, 2004-07-29 22:48:06-07:00, viro@www.linux.org.uk [PATCH] fbcon_do_set_font() sanitized fbcon internal cleanup. Instead of passing console_font_op into fbcon_do_set_font() we pass width/height directly. Amusing (but harmless) bug fixed there: if (!w > 32) { bogus code that fortunately never got triggered } Fixed by removal of the junk in question (and yes, it's verifiable junk - it would not do anything even if we replaced the check with intended !(w > 32)). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1824, 2004-07-29 22:47:55-07:00, viro@www.linux.org.uk [PATCH] con_set_font sanitized con_font_set() sanitized. We are passing console_font and flags into the method in separate arguments and we are not messing with console_font_op->data anymore - it's a userland pointer (to be annotated several patches later in the series, due to another abuse of console_font_op that needs to be fixed first), while console_font->data is kernel one and they don't mix anymore. We also do a sanity check (font width > 0) in the caller instead of method instances, since we are already checking for width <= 32 and height <= 32 there; doesn't make sense leaving that one in method instances. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1823, 2004-07-29 22:47:43-07:00, viro@www.linux.org.uk [PATCH] con_font_copy sanitized ->con_font_copy() sanitized. We extract the number of console to copy the font from in the caller (it's taken from the field of console_font_op that is normally used for font height - messy even for an ioctl, but that animal used to be passed all the way down into console drivers). With decoding done in con_font_copy(), we simply pass source console number into the method. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1822, 2004-07-29 22:47:32-07:00, viro@www.linux.org.uk [PATCH] con_font_default sanitized ->con_font_default() sanitized. We copy font name (if any) from userland in the caller and pass it explicitly. We are also beginning to get rid of console_font_op in method arguments. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1821, 2004-07-29 22:47:21-07:00, viro@www.linux.org.uk [PATCH] con_font_op split Preparations for cleanups: con_font_op() is turned into a switch calling con_font_{get,set,default,copy} depending on the operation required; method ->con_font_op() also split, with NULL resulting in -ENOSYS on operation in question. Code that used to be in con_font_op() got slightly cleaned up after move into new helpers (we are beginning to untangle the mess; there will be more cleanups in the next patches). Methods are currently using exact same arguments as old ->con_font_op(). That will change in subsequent patches, method by method (right now there's a hell of a scary field reuse between them, making impossible to do any static checks and practically begging for bugs). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ChangeSet@1.1820, 2004-07-29 22:44:24-07:00, benh@kernel.crashing.org [PATCH] ppc64: fix memcpy_to/from_io The ppc64 implementation of memcpy_to/from_io was bogus (used memcpy which uses cache hints and thus is broken on non cacheable IO space). This re-implements them with some simple/gross C code doing 32 bits accesses when aligned and bytes accesses when not. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds ChangeSet@1.1819, 2004-07-29 22:44:13-07:00, benh@kernel.crashing.org [PATCH] ppc64: hash table races fixes This fixes some possible rare issues with the hash code beeing called with interrupts enabled from update_mmu_cache, and fixes some races in the iSeries low level htab code by adding an array of spinlocks This is actually an old patch already present in SLES kernel and that got "missed" somewhat in the main tree, adapted to recent changes. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds ChangeSet@1.1807.16.10, 2004-07-29 19:36:08-07:00, davem@nuts.davemloft.net [DMA]: Fix example code in DMA-mapping.txt Spotted by Jack Spaar Signed-off-by: David S. Miller ChangeSet@1.1807.17.37, 2004-07-29 19:33:10-07:00, davem@nuts.davemloft.net [XFRM]: Declare xfrm6_output in net/xfrm.h ChangeSet@1.1807.17.36, 2004-07-29 19:18:09-07:00, herbert@gondor.apana.org.au [IPSEC]: Move generic encap code into xfrm6_output. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1807.17.35, 2004-07-29 19:07:16-07:00, herbert@gondor.apana.org.au [AH6]: Rearrange routing headers This patch rearranges the IPv6 routing header so that the destination addresses appear in the order as they would on the destination. This is specified in Appendix A2 of RFC 2402. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1807.17.34, 2004-07-29 17:34:40-07:00, davem@nuts.davemloft.net [NET]: Decrease skb->cb[] to 40 bytes. No control block usage, even on 64-bit, needs the full current 48 bytes. This brings sk_buff size down to 256 bytes on 64-bit platforms and fixes some performance regressions due to the addition of the input_dev member. Signed-off-by: David S. Miller ChangeSet@1.1807.16.9, 2004-07-29 17:32:10-07:00, davem@nuts.davemloft.net [SPARC]: sparc64 openpromio.h needs compiler.h, sync sparc32 ChangeSet@1.1807.17.33, 2004-07-29 15:53:08-07:00, shemminger@osdl.org [NET]: Convert netrom to use module_param. Convert Netrom to use module_param Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.17.32, 2004-07-29 15:52:33-07:00, shemminger@osdl.org [NET]: Convert ROSE to use module_param. Switch to module_param and the hash list can be local. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.17.31, 2004-07-29 15:48:49-07:00, herbert@gondor.apana.org.au [NET]: Allow MD5 to be a module I found that recent 2.6 kernels no longer allowed me to build MD5 as a module even though everything that used it were modules (including ipv6 and sctp). It turns out that there were boolean options selecting MD5 in the Kconfig files. Due to limitations in the current kconfig implementation, this forces MD5 to be a boolean as well. The usual workaround in these cases is to move the selection up to the closest tristate. This is what the following patch does. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1807.17.30, 2004-07-29 15:45:05-07:00, hadi@cyberus.ca [PKT_SCHED]: Fix pkt_cls.h incompatabilities. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller ChangeSet@1.1807.17.29, 2004-07-29 15:34:34-07:00, akpm@osdl.org [PATCH 1/1]: net/sunrpc/xprt.c gcc341 inlining fix From: Mikael Pettersson gcc-3.4.1 errors out in 2.6.8-rc1-mm1 at net/sunrpc/xprt.c: net/sunrpc/xprt.c: In function 'xprt_reserve': net/sunrpc/xprt.c:84: sorry, unimplemented: inlining failed in call to 'do_xprt_reserve': function body not available net/sunrpc/xprt.c:1307: sorry, unimplemented: called from here make[2]: *** [net/sunrpc/xprt.o] Error 1 make[1]: *** [net/sunrpc] Error 2 make: *** [net] Error 2 do_xprt_reserve() is marked inline but used defore its function body is available. Moving it before its only caller fixes the problem. Signed-off-by: Mikael Pettersson Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1807.17.28, 2004-07-29 15:32:58-07:00, akpm@osdl.org [PATCH 8/8] gcc-3.5 fixes From: Andi Kleen Trivial gcc-3.5 build fixes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1807.17.27, 2004-07-29 15:32:28-07:00, akpm@osdl.org [PATCH 7/8] gcc-3.5 fixes From: Andi Kleen Trivial gcc-3.5 build fixes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1807.17.26, 2004-07-29 15:31:58-07:00, akpm@osdl.org [PATCH 6/8] gcc-3.5 fixes From: Andi Kleen Trivial gcc-3.5 build fixes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1807.17.25, 2004-07-29 15:31:29-07:00, akpm@osdl.org [PATCH 5/8] gcc-3.5 fixes From: Andi Kleen Trivial gcc-3.5 build fixes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1807.17.24, 2004-07-29 15:30:56-07:00, akpm@osdl.org [PATCH 4/8] gcc-3.5 fixes From: Andi Kleen Trivial gcc-3.5 build fixes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1807.17.23, 2004-07-29 15:30:16-07:00, akpm@osdl.org [PATCH 3/8] gcc-3.5 fixes From: Andi Kleen Trivial gcc-3.5 build fixes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1807.17.22, 2004-07-29 15:28:08-07:00, akpm@osdl.org [PATCH 2/8] gcc-3.5 fixes From: Andi Kleen Trivial gcc-3.5 build fixes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1807.17.21, 2004-07-29 15:27:24-07:00, akpm@osdl.org [PATCH 1/8] gcc-3.5 fixes From: Andi Kleen Trivial gcc-3.5 build fixes. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1807.17.20, 2004-07-29 14:41:53-07:00, shemminger@osdl.org [BRIDGE]: RCU fix Follow up to earlier RCU patch. Since now using RCU, need to use deferred free. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.17.19, 2004-07-29 14:41:06-07:00, shemminger@osdl.org [BRIDGE]: forwarding table RCU Convert the bridge forwarding database over to using RCU. This avoids a read_lock and atomic_inc/dec in the fast path of output. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.17.18, 2004-07-29 14:40:24-07:00, shemminger@osdl.org [BRIDGE]: linkstate handling This makes bridge port status reflect both the state of the interface from software (up/down) and the carrier. It makes STP handle link failure (cable breakage, etc). The original concept comes from a Mark Ruijter who implemented it differently. My way is simpler and requires no polling. Obviously, this link state detection will only work if the network card handles the events properly. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.17.17, 2004-07-29 14:39:35-07:00, shemminger@osdl.org [BRIDGE]: dev_xmit cleanup The br_dev_xmit function was broken in two pieces (needlessly). Put it back together. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.17.16, 2004-07-29 14:38:51-07:00, shemminger@osdl.org [BRIDGE]: Propagate bridge internal MTU changes Need to propagate MTU changes that the bridge does to it's pseudo interface up to others. There ends up being a double call to br_min_mtu() but that's harmless. Cleans up the EXPORT_SYMBOLS including dev_change_flags which is used by vlan. Shouldn't be basing exports on kernel config options like this. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1814.2.2, 2004-07-29 16:30:37-05:00, stevef@stevef95.austin.ibm.com [CIFS] fix smb return code Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.1817, 2004-07-29 08:17:53-07:00, trini@kernel.crashing.org [PPC32] Merge MPC52xx changes with recent CPM changes. ChangeSet@1.1814.1.99, 2004-07-29 15:12:57+02:00, tnt@246tNt-laptop.lan.ayanami.246tNt.com [serial/ppc] Add support for MPC52xx PSCs. Can be used as serial port and console. Compliant with the OCP driver model. Signed-off-by: Sylvain Munaut ChangeSet@1.1814.1.98, 2004-07-29 15:09:03+02:00, tnt@246tNt-laptop.lan.ayanami.246tNt.com [ppc] Add basic support for the Freescale MPC52xx embedded CPU and the LITE5200 platform Signed-off-by: Sylvain Munaut ChangeSet@1.1814.1.97, 2004-07-28 23:14:37-07:00, pavel@ucw.cz [PATCH] swsusp: documentation update Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.96, 2004-07-28 23:14:26-07:00, lcapitulino@prefeitura.sp.gov.br [PATCH] remove dead code from copy_process() Don't assign to `retval' twice in a row. Signed-off-by: Luiz Capitulino Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.95, 2004-07-28 23:14:15-07:00, bjorn.helgaas@hp.com [PATCH] Fix up HP copyright & license text Fix up HP copyrights and add licensing terms (GPL v2) for hp-agp.c and pcdp. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.94, 2004-07-28 23:14:03-07:00, dsaxena@plexity.net [PATCH] Watchdog driver for Intel IXP2000 Network Processor Following patch adds support for the watchdog driver embedded in Intel's IXP2000 family of network processors. The architecture-specific bits of IXP2000 support will be merged upstream via the ARM tree once all the various drivers have been merged. Signed-off-by: Deepak Saxena Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.93, 2004-07-28 23:13:51-07:00, davidm@napali.hpl.hp.com [PATCH] comment "ptrace_list" and "children" members Document the purpose of the "ptrace_list/ptrace_children" and "children/sibling" lists. Signed-off-by: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.92, 2004-07-28 23:13:40-07:00, olh@suse.de [PATCH] mark swim3 floppy controller as removable device Mark the mac floppy controller driver as removable media. This prevents an entry in /proc/partitions. Several tools will not try to access the floppy anymore with this change. Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.91, 2004-07-28 23:13:29-07:00, arekm@pld-linux.org [PATCH] convert ipmi_watchdog to use module option nowayout Convert ipmi_watchdog to also use module option `nowayout' as is done in other watchdog drivers. From: Corey Minyard The patch is good (same style as other watchdogs), but needs to have some documentation updated. I've tacked that on. Signed-off-by: Arkadiusz Miskiewicz Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.90, 2004-07-28 23:13:18-07:00, andrea@suse.de [PATCH] writepages drops bh on not uptodate page I think I understood why some ext2 fs corruption still happens even after the last i_size fix. what happened I believe is that the writepages layer got a not a fully uptodate page (in turn with bh mapped on top of it), and then right before unlocking the page and entering the writeback mode, it freed all the bh. Without bh a not uptodate page will trigger a full readpage from disk, that overwrites the pagecache before the multi-bio gets submitted, generating fs corruption. I believe the below patch should fix it (untested) against kernel CVS. The testcases developed by Kurt showed the pagecache being overwritten with on-disk data at block offsets, and Chris as well was wondering about races between wait_on_page_writeback and readpage. the below fix just explains everything we've seen since not-fully-uptodate pages must have always bh on them and the below patch enforces just that invariant, and it should fix our pagecache-overwritten-by-disk-data problem. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.89, 2004-07-28 23:13:06-07:00, bgerst@quark.didntduck.org [PATCH] remove boot98 Remove the orphaned PC9800 boot code. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.88, 2004-07-28 23:12:55-07:00, alan@redhat.com [PATCH] Subject: PATCH: fix bogus ioctl return in mtrr This is fairly self explanatory - ENOIOCTLCMD is an internal code outside of the -1 to -511 range. The correct return for an unknown ioctl is -ENOTTY although some Linux devices return the incorrect -EINVAL result. Patch-By: Alan Cox OSDL Developer Certificate of Origin 1.0 included herein by reference Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.87, 2004-07-28 23:12:45-07:00, mbp@sourcefrog.net [PATCH] trivial doc patch for partitions It's slightly hard to see how these variables are used; this patch adds a short description. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.86, 2004-07-28 23:12:34-07:00, mbp@sourcefrog.net [PATCH] lost error code in rescan_partitions This fixes a path where an error from reloading the partition table could be lost. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.85, 2004-07-28 23:12:22-07:00, schwidefsky@de.ibm.com [PATCH] s390: network driver changes From: Ursula Braun-Krahl From: Thomas Spatzier From: Peter Tiedemann network driver changes. - iucv: add missing symbolic links between /sys/bus/iucv/drivers/netiucv and /sys/class/net. - iucv: make use of the debug feature. - iucv: 0 vs. NULL cleanup, avoid build warnings. - iucv: remove unnecessary -ENODEV check after call to iucv_declare_buffer. - ctc: adjust debug feature log levels. - lcs: replace broken schedule_timeout call with msleep. - qeth: add missing link type. - qeth: treat add_hhlen attribute as decimal value. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.84, 2004-07-28 23:12:10-07:00, schwidefsky@de.ibm.com [PATCH] s390: zfcp host adapter. From: Heiko Carstens From: Maxim Shchetynin zfcp host adapter changes: - Get rid of ZFCP_WAIT_EVENT_TIMEOUT macro. - Correct an error log mesage. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.83, 2004-07-28 23:11:59-07:00, schwidefsky@de.ibm.com [PATCH] s390: core changes s390 core changes: - Rework system call entry cleanup code to fix a potential asynchronous interrupt stack overflow if the user stack pointer happens to be in the same range as the asynchronous stack. - Replace broken schedule_timeout call with msleep. - Regenerate default configuration Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.82, 2004-07-28 23:11:47-07:00, zwane@fsmlabs.com [PATCH] Recommend 'noapic' when timer via IOAPIC fails We might as well recommend the user boot with the noapic kernel parameter instead of filling poor Ingo's mailbox. Signed-off-by: Zwane Mwaikambo Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.81, 2004-07-28 23:11:37-07:00, akpm@osdl.org [PATCH] ncpfs: setattr return value fix Arjan's new warning found a bug! fs/ncpfs/inode.c: In function `ncp_notify_change': fs/ncpfs/inode.c:960: warning: ignoring return value of `inode_setattr', declared with attribute warn_unused_result Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.80, 2004-07-28 23:11:25-07:00, j.blunck@tu-harburg.de [PATCH] ext2_readdir() return value fix ext2_readdir() is ignoring the set error return values and always returns 0. Signed-off-by: Jan Blunck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.79, 2004-07-28 23:11:14-07:00, olh@suse.de [PATCH] ppc32: snd-powermac requires i2c The alsa driver for powermacs requires i2c support. Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.78, 2004-07-28 23:11:03-07:00, bart@samwel.tk [PATCH] Automatically disable laptop mode when battery almost runs out. From: Jan Topinski Add support to automatically disable laptop mode when the battery almost runs out. This prevents data loss when the battery actually runs out. Signed-off-by: Bart Samwel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.77, 2004-07-28 23:10:53-07:00, bart@samwel.tk [PATCH] Add documentation about /proc/sys/vm/laptop_mode to various docs. From: Bart Samwel A bunch of small laptop mode updates: * Mention the laptop_mode and block_dump sysctls in the relevant docs, referring to the laptop-mode.txt. Improve description of what the laptop_mode knob means (i.e. seconds between last I/O and automatic sync). * Document the most relevant config file options. * Change the installation instructions in the laptop mode doc to describe the ACPI-bound version first, because this is the easiest. Explain the non-ACPI version afterwards. Added a reference to my "packaged version" of the scripts. * Move the setting of hdparm and cpu frequency out of the ACPI script and into the core laptop mode script. Add config option DO_HD to enable hdparm. Add config setting HD to set device to do hdparm on. Rename Dax's CPU_MANAGE to DO_CPU, with 0/1 instead of yes/no, to improve consistency. * Fix a problem where the root filesystem wouln't be remounted when /etc/mtab listed its type as "unknown". Deduce the type of "unknown" filesystems from /etc/fstab. This depends on the patch that adds config files, which was submitted to Linus by Dax Kelson on July 10. Signed-off-by: Bart Samwel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.76, 2004-07-28 23:10:42-07:00, bart@samwel.tk [PATCH] Config file for laptop mode. From: Dax Kelson Add support for a external configuration file for /sbin/laptop_mode, and /etc/acpi/actions/battery.sh. Convert battery.sh to use CPUFreq (off by default) instead of CPU throttling (that was off by default). Cleanup some formating for 80 columns. All changes were written by me on a plane flight from Philadelphia to Salt Lake City on July 9th. :) (Note from Bart Samwel: was submitted to Linus earlier, this patch is unchanged from that. I needed to submit this into -mm for now because my other changes are dependent on Dax's changes.) Signed-off-by: Bart Samwel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.75, 2004-07-28 23:10:30-07:00, samuel.thibault@ens-lyon.org [PATCH] front buttons wouldn't mute ESS Maestro Here is a small fix to enable muting ESS Maestro sound card thanks to the up/down buttons: when has reached the driver's minimum (! this is something like -dB value), just mute. (It was working in OSS driver, but not in ALSA) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.74, 2004-07-28 23:10:19-07:00, shemminger@osdl.org [PATCH] hlist_for_each_safe cleanup Make code for hlist_for_each_safe use better code (same as hlist_for_each_entry_safe). Get rid of comment about prefetch, because that was fixed a while ago. Only current use of this is in the bridge code, that I maintain. Signed-off-by: Stephen Hemminger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.73, 2004-07-28 23:10:10-07:00, roland@topspin.com [PATCH] Export all functions in lib/string.c Quite a few functions in lib/string.c are not exported. I ran into this trying to use strnchr() in a module. This patch - exports every function defined in lib/string.c - adds some missing __HAVE_ARCH_xxx defines for i386 - gets rid of the exports of functions from lib/string.c in arch/s390 (BTW, why is s390 exporting things NOVERS?) Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.72, 2004-07-28 23:09:59-07:00, domen@coderock.org [PATCH] remove faulty __init's from drivers/video/fbmem.c From: Geert Uytterhoeven These four are called from fb_show_logo, which is exported symbol, called by fbcon_switch. From: Domen Puncer Signed-off-by: Maximilian Attems Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.71, 2004-07-28 23:09:47-07:00, shrybman@aei.ca [PATCH] page_cache_readahead unused variable Removal of unused variable in mm/readahead.c. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.70, 2004-07-28 23:09:36-07:00, eger@havoc.gtf.org [PATCH] cirrusfb: update for amiga (zorro) Cirrusfb updates: - Cirrusfb depends on Zorro or PCI - Revive Zorro support, using new Zorro driver framework - Merge PCI and Zorro code where possible - Use C99 initializers - Kill superfluous whitespace - #undef I/O ops before redefining them on Amiga From: Geert Uytterhoeven Signed-off-by: David Eger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.69, 2004-07-28 23:09:24-07:00, geert@linux-m68k.org [PATCH] Dallas 1-wire delay.h Dallas 1-wire: never include directly Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.68, 2004-07-28 23:09:13-07:00, geert@linux-m68k.org [PATCH] depends on PCI: Matrox 1-wire Matrox 1-wire unconditionally depends on PCI Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.67, 2004-07-28 23:09:02-07:00, geert@linux-m68k.org [PATCH] depends on PCI: Toshiba and VIA FIR Toshiba and VIA FIR unconditionally depend on PCI Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.66, 2004-07-28 23:08:50-07:00, geert@linux-m68k.org [PATCH] depends on PCI DMA API: Cisco/Aironet 34X/35X/4500/4800 Cisco/Aironet 34X/35X/4500/4800 unconditionally depends on the PCI DMA API, so mark it broken if !PCI Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.65, 2004-07-28 23:08:39-07:00, geert@linux-m68k.org [PATCH] depends on PCI: Technisat Skystar2 PCI Technisat Skystar2 PCI unconditionally depends on PCI Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.64, 2004-07-28 23:08:28-07:00, geert@linux-m68k.org [PATCH] depends on PCI: Guillemot MAXI Radio FM 2000 Guillemot MAXI Radio FM 2000 unconditionally depends on PCI Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.63, 2004-07-28 23:08:16-07:00, geert@linux-m68k.org [PATCH] !PCI warnings: Hisax ISDN Kill warnings in Hisax ISDN drivers when !PCI. Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.62, 2004-07-28 23:08:04-07:00, geert@linux-m68k.org [PATCH] depends on PCI: Fritz!PCI/PCIv2/PnP and HYSDN Fritz!PCI/PCIv2/PnP and HYSDN unconditionally depend on PCI Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.61, 2004-07-28 23:07:53-07:00, geert@linux-m68k.org [PATCH] depends on PCI DMA API: IEEE1394 core and SBP-2 IEEE1394 core and SBP-2 unconditionally depend on the PCI DMA API, so mark them broken if !PCI Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.60, 2004-07-28 23:07:42-07:00, geert@linux-m68k.org [PATCH] depends on PCI: VIA686A i2c VIA686A i2c unconditionally depends on PCI Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.59, 2004-07-28 23:07:30-07:00, geert@linux-m68k.org [PATCH] !PCI warnings: Specialix serial Kill warnings in Specialix serial driver when !PCI. Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.58, 2004-07-28 23:07:19-07:00, geert@linux-m68k.org [PATCH] !PCI warnings: Moxa serial Kill warnings in MOXA Intellio and Smartio multiport serial drivers when !PCI. Also kill warnings about unused variables in the non-modular case. Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.57, 2004-07-28 23:07:08-07:00, geert@linux-m68k.org [PATCH] depends on PCI: Multi-Tech, SyncLink, Applicom serial Multi-Tech, Microgate SyncLink, and Applicom serial unconditionally depend on PCI Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.56, 2004-07-28 23:06:57-07:00, geert@linux-m68k.org [PATCH] M68k Maintainership M68k maintainership update: - Transfer maintainership to Roman and me (ack'ed by Jes and Roman) - Update main website URL - Add Linux/m68k CVS repository website Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.55, 2004-07-28 23:06:45-07:00, geert@linux-m68k.org [PATCH] M68k pgalloc fixup M68k: Fix build after surgery in 2.6.8-rc1: - Add missing include on machines with a standard m68k MMU - Convert __pte_free_tlb() to a macro (like it is on most other archs) on Sun-3, to avoid include hell Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.54, 2004-07-28 23:06:34-07:00, geert@linux-m68k.org [PATCH] M68k checksum include M68k: Add missing include, showing up due to include reshuffling in 2.6.8-rc1 Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.53, 2004-07-28 23:06:23-07:00, geert@linux-m68k.org [PATCH] M68k bitops M68k: Add `volatile' to some bitops parameters, as this is required by the cpumask code in 2.6.8-rc1. Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.52, 2004-07-28 23:06:11-07:00, geert@linux-m68k.org [PATCH] dmasound paths Dmasound was moved to sound/oss/ a while ago Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.51, 2004-07-28 23:06:00-07:00, geert@linux-m68k.org [PATCH] m68k hardirq.h M68k: Add missing #include Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.50, 2004-07-28 23:05:49-07:00, geert@linux-m68k.org [PATCH] amifb sparse &= Amiga Frame buffer: Use `&' instead of `&=' (found by sparse, present since at least 2.0.x) Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.49, 2004-07-28 23:05:37-07:00, geert@linux-m68k.org [PATCH] dnfb sparse struct init Apollo Frame buffer: Fix C99 struct initializers (found by sparse) Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.48, 2004-07-28 23:05:26-07:00, geert@linux-m68k.org [PATCH] m68k sparse floating point M68k: Replace floating point by integer constants (found by sparse) Affected drivers: - Amiga frame buffer - ATI Mach64 frame buffer Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.47, 2004-07-28 23:05:15-07:00, geert@linux-m68k.org [PATCH] dsp56k sparse const Atari dsp56k: Add missing `const' keywords (found by sparse) Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.46, 2004-07-28 23:05:04-07:00, geert@linux-m68k.org [PATCH] m68k sparse inline M68k: Define inline functions before use (found by sparse) Affected drivers: - Atari floppy - Amiga A2232 serial - Amiga Fastlane SCSI - Mac/PowerMac Valkyrie frame buffer Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.45, 2004-07-28 23:04:52-07:00, geert@linux-m68k.org [PATCH] m68k sparse extern M68k: Remove `extern' at function definition (found by sparse) Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.44, 2004-07-28 23:04:41-07:00, geert@linux-m68k.org [PATCH] m68k sparse void return M68k: Don't return anything in functions returning void (found by sparse) Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.43, 2004-07-28 23:04:30-07:00, geert@linux-m68k.org [PATCH] m68k sparse #if vs. #ifdef M68k: Use #ifdef instead of #if (found by sparse) Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.42, 2004-07-28 23:04:18-07:00, geert@linux-m68k.org [PATCH] m68k sparse missing void M68k: Add missing `void' parameters (found by sparse) Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.41, 2004-07-28 23:04:07-07:00, geert@linux-m68k.org [PATCH] M68k ifpsp060 68060 Integer Support Package: Fix _060_real_lock_page(): test %d0 before actually using it (from Roman Zippel) Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.40, 2004-07-28 23:03:56-07:00, geert@linux-m68k.org [PATCH] M68k 68060 errata I14 M68k: gcc lately manages to generate the code sequence described in the 060 errata I14, so use the described workaround (from Roman Zippel) Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.39, 2004-07-28 23:03:45-07:00, osst@riede.org [PATCH] MAINTAINERS: update mailing list for osst This list has been on sourceforge for a while now, please apply this patch to make MAINTAINERS reflect that. Signed-off-by: Willem Riede Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.38, 2004-07-28 23:03:33-07:00, miklos@szeredi.hu [PATCH] fix readahead breakage for sequential after random reads Current readahead logic is broken when a random read pattern is followed by a long sequential read. The cause is that on a window miss ra->next_size is set to ra->average, but ra->average is only updated at the end of a sequence, so window size will remain 1 until the end of the sequential read. This patch fixes this by taking the current sequence length into account (code taken from towards end of page_cache_readahead()), and also setting ra->average to a decent value in handle_ra_miss() when sequential access is detected. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.37, 2004-07-28 23:03:22-07:00, bgerst@didntduck.org [PATCH] remove scripts/mkconfigs This script is no longer used after the patch to consolidate the stored configs. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.36, 2004-07-28 23:03:11-07:00, khalid_aziz@hp.com [PATCH] ipmi_msghandler module load failure fix On a 2.6.7 kernel, when I try to modprobe ipmi_msghandler, it fails to load with following message: FATAL: Error inserting ipmi_msghandler (/lib/modules/2.6.7/kernel/drivers/char/ipmi/ipmi_msghandler.ko): Invalid module format And there is an error message in dmesg: ipmi_msghandler: init symbol 0xa000000200058080 used in module code at a000000200031b32 What I have been able to determine is that ipmi_msghandler.c defines ipmi_init_msghandler() as the module_init() routine and then it also calls ipmi_init_msghandler() diretcly from couple of other places. This does not seem to be okay in 2.6.7 kernel. I was able to fix this by defining a new module_init routine which in turn calls ipmi_init_msghandler(). I also removed __init from ipmi_init_msghandler() since it gets called from ipmi_open() on an open of the ipmi device file. So I would think we want to keep ipmi_init_msghandler() around even after initialization. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.35, 2004-07-28 23:03:00-07:00, eranian@hpl.hp.com [PATCH] fix for buffer limit for long in sysctl.c Fix a bug in do_proc_doulongvec_minmax() where the the string buffer was too short to parse a 64-bit number expressed in decimal. That was causing problems with entries in /proc/sys using long and allowing large number (such as -1) Signed-off-by: Stephane Eranian Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.34, 2004-07-28 23:02:48-07:00, rhim@cc.gatech.edu [PATCH] Remove dead comment in mm/filemap.c Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.33, 2004-07-28 23:02:37-07:00, mika@osdl.org [PATCH] sign fix in swapfile.c CC mm/swapfile.o mm/swapfile.c: In function `scan_swap_map': mm/swapfile.c:114: warning: comparison between signed and unsigned Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.32, 2004-07-28 23:02:27-07:00, pavel@suse.cz [PATCH] radeonfb x86_64 fix Fix radeonfb and aty128fb on x86_64 by using the correct ifdef. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.31, 2004-07-28 23:02:16-07:00, miles@gnu.org [PATCH] v850: Define find_first_bit Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.30, 2004-07-28 23:02:05-07:00, pluto@pld-linux.org [PATCH] fdomain_cs needs ISA drivers/scsi/pcmcia/fdomain_cs.ko needs unknown symbol isa_memcpy_fromio drivers/scsi/pcmcia/fdomain_cs.ko needs unknown symbol isa_readb iirc the isa bus isn't available on ppc. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.29, 2004-07-28 23:01:53-07:00, oleg@tv-sign.ru [PATCH] hugetlbfs vm_pgoff bugs 1. hugetlbfs_file_mmap() must check that vm_pgoff is hugepage aligned. 2. hugetlb_vmtruncate_list() confuses << with >> while converting vm_pgoff to huge page offset, and zaps wrong area. Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.28, 2004-07-28 23:01:42-07:00, agx@sigxcpu.org [PATCH] Fix rivafb's NV_ARCH_, cleanup DEBUG, backlight control on ppc - fixes the PCI-IDs (needed to get it to work on at least the NV17) - cleans up the DEBUG option (similar to the new radeonfb). This also makes it easy to replace printk by btext_printf() (on ppc) or similar to ease debugging of the fb code when all else fails. - adds backlight control for Apple powerbooks Signed-off-by: Guido Guenther Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.27, 2004-07-28 23:01:30-07:00, davidm@napali.hpl.hp.com [PATCH] Make get_user_pages() work again for ia64 gate area Changeset roland@redhat.com[torvalds]|ChangeSet|20040624165002|30880 inadvertently broke ia64 because the patch assumed that pgd_offset_k() is just an optimization of pgd_offset(), which it is not. This patch fixes the problem by introducing pgd_offset_gate(). On architectures on which the gate area lives in the user's address-space, this should be aliased to pgd_offset() and on architectures on which the gate area lives in the kernel-mapped segment, this should be aliased to pgd_offset_k(). This bug was found and tracked down by Peter Chubb. Signed-off-by: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.26, 2004-07-28 23:01:19-07:00, janitor@sternwelten.at [PATCH] drivers/macintosh/macserial.c MIN/MAX removal Removes unnecessary min/max macros and changes calls to use kernel.h macros instead. Signed-off-by: Maximilian Attems Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.25, 2004-07-28 23:01:08-07:00, nacc@us.ibm.com [PATCH] macintosh/mediabay: replace schedule_timeout() with msleep() Use msleep() instead of schedule_timeout() to guarantee the task delays the desired time. Signed-off-by: Nishanth Aravamudan Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.24, 2004-07-28 23:00:58-07:00, nacc@us.ibm.com [PATCH] ide/pmac: replace schedule_timeout() with msleep() Use msleep() instead of schedule_timeout() to guarantee the desired delay. Signed-off-by: Nishanth Aravamudan Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.23, 2004-07-28 23:00:47-07:00, nacc@us.ibm.com [PATCH] macintosh/adb: replace schedule_timeout() with msleep() Use msleep() instead of schedule_timeout() to guarantee the task delays the desired time. Signed-off-by: Nishanth Aravamudan Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.22, 2004-07-28 23:00:36-07:00, trini@kernel.crashing.org [PATCH] ppc32: add gcc-3.4+binutils-2.14 check Add a build-time check for gcc-3.4 and binutils-2.14. They don't play well together. Signed-off-by: Tom Rini Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.21, 2004-07-28 23:00:24-07:00, nikai@nikai.net [PATCH] ppc32: fix comment in arch/ppc/platforms/pmac_pci.c Typos. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.20, 2004-07-28 23:00:15-07:00, mporter@kernel.crashing.org [PATCH] ppc32: export some DMA API symbols Exports some DMA API symbols so module clients work. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.19, 2004-07-28 23:00:04-07:00, mporter@kernel.crashing.org [PATCH] ppc32: Fix PPC44x early uart setup Fix a bug introduced in the PPC44x early uart setup from the last set of 44x fixes. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.18, 2004-07-28 22:59:52-07:00, rsa@us.ibm.com [PATCH] ppc64: HVCS driver * include/asm-ppc64/hvcserver.h New file added to wrap ppc64 architecture specific firmware calls for use by HVCS. This file provides a struct hvcs_partner_info definition, headers for partner info gathering and vterm connection and termination interfaces. * arch/ppc64/kernel/Makefile Added build directive for hvcserver.o when HVCS is configured. * arch/ppc64/kernel/hvconsole.c Exported hvc_put_chars() and hvc_get_chars() for use by HVCS. * arch/ppc64/kernel/hvcserver.c Body of hvcserver module which accompanies the hvcs module and provides ppc64 architecture firmware calls for use by HVCS. This file provides function bodies for partner info gathering and vterm connection and termination interfaces. * drivers/char/Kconfig Added CONFIG_HVCS option for both built-in version and module version of hvcs. * drivers/char/Makefile Added build directive for hvcs.o when CONFIG_HVCS is configured. * drivers/char/hvcs.c This is the device driver for the IBM Hypervisor Virtual Console Server, "hvcs". The IBM hvcs provides a tty driver interface to allow Linux user space applications access to the system consoles of logically partitioned operating systems, e.g. Linux, running on the same partitioned Power5 ppc64 system. Physical hardware consoles per partition are not practical on this hardware so system consoles are accessed by this driver using inter-partition firmware interfaces to virtual terminal devices. * Documentation/powerpc/hvcs.txt HVCS installation and usage documentation. Thanks everyone for all the help with this driver [Andrew Morton, Paul Mackerras, Ben Herrenschmidt, Dave Hansen, Paul Mackerras, Dave Boutcher, Hollis Blanchard, Santiago Leon, Brian King, Randy Dunlap]. Signed-off-by: Ryan S. Arnold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.17, 2004-07-28 22:59:41-07:00, jschopp@austin.ibm.com [PATCH] ppc64 SMT bugfix This patch is fairly straightforward. maxcpus should be per SMT thread and not per physical processor. SUSE picked this up back in May (was discussed on ppc64 mailing list) and has had no trouble with it. Signed-off-by: Joel Schopp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.16, 2004-07-28 22:59:29-07:00, paulus@samba.org [PATCH] ppc64: whitespace cleanup in prom.c This patch, originally from Linas Vepstas, cleans up some wonky indentation and other formatting issues in arch/ppc64/kernel/prom.c. It does not change any actual code. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.15, 2004-07-28 22:59:18-07:00, paulus@samba.org [PATCH] ppc64: Fix RAS irq handlers On pSeries systems, the firmware tells us a list of interrupt numbers that we should enable in order to detect various error conditions. When we get one of these interrupts we are supposed to call the firmware, which will work out and tell us what the error was and possibly also fix it. We were not correctly parsing the property values that tell us which interrupts need to be handled in this fashion. This patch fixes it. It exports prom_n_intr_cells from prom.c since that is needed to do the parsing properly. Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.14, 2004-07-28 22:59:08-07:00, jschopp@austin.ibm.com [PATCH] ppc64: cpu hotplug fix On Power4 and earlier hardware there is no need to clear the CPPR (see RPAp 479 section 18.5.4.7.2 for what little info there is on the CPPR) when stopping a cpu. On hardware that uses Power5 an undocumented change has been made that requires the CPPR to be cleared if an isolate is to be done on the stopped cpu. So the following patch lets cpu hotplug work on the recent hardware. I sent this patch to the ppc64-dev list back in mid April and Suse picked it up then for SLES9 so it has been well tested for several months. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.13, 2004-07-28 22:58:57-07:00, anton@samba.org [PATCH] ppc64: remove multiple IRQ optimisation ppc64 has an optimisation where it loops on get_irq until there are no more interrupts to be handled. Mark Hack notes that this optimisation hardly ever hits and costs us a potentially expensive extra read of an interrupt register every interrupt. Also make do_IRQ void, the callers never use the return value. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.12, 2004-07-28 22:58:46-07:00, david@gibson.dropbear.id.au [PATCH] page align emergency stack The PPC64 ABI requires the stack to be 128 byte aligned (and that can become important if AltiVec registers are saved there). In the kernel, that's usually dealt with by the fact that the stack has a page more-or-less to itself. However, the emergency stacks (used in SMP bringup and when we detect a bad stack pointer) aren't necessarily page aligned, or anything aligned for that matter. This patch applies the necessary alignement constraint to them. Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.11, 2004-07-28 22:58:35-07:00, js@convergence.de [PATCH] dvb_usercopy() fix Fix some breakage in dvb_usercopy() introduced by sparse cleanups in -rc2. Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.10, 2004-07-28 22:58:23-07:00, alan@redhat.com [PATCH] DVB major number The DVB merge forgot an important change - DVB is currently using major 250, which is "local" while devices.txt (and thus FSSTND/LSB) require it uses the officially allocated 212 major. Fortunately most 2.6 users don't currently use DVB and vendors ship devfs or versions of makedev that do the right thing and generate 212 majors. Fix below, original author: Red Hat , OSDL certificate of authorship included by reference. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.9, 2004-07-28 22:58:12-07:00, hugh@veritas.com [PATCH] swapoff mmap_sem deadlock Updating the mm lock ordering documentation drew attention to the fact that we were wrong to blithely add down_read(&mm->mmap_sem) to swapoff's unuse_process, while it holds swapcache page lock: not very likely, but it could deadlock against, say, mlock faulting a page back in from swap. But it looks like these days it's safe to drop and reacquire page lock if down_read_trylock fails: the page lock is held to stop try_to_unmap unmapping the page's ptes as fast as try_to_unuse is mapping them back in; but the recent fix for get_user_pages works to prevent that too. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.8, 2004-07-28 22:58:01-07:00, hugh@veritas.com [PATCH] install_page vs. vmtruncate BK is still missing one piece for Oleg's install_page/vmtruncate races. Oleg didn't explicitly ACK this, but I think he did implicitly: Oleg? The previous patch to install_page, returning an error if !page_mapping once page_table_lock is held, is not enough to guard against vmtruncate. When unmap_mapping_range already did this vma, but truncate_inode_pages has not yet done this page, page->mapping will still be set, but we must now refrain from inserting the page into the page table. Could check truncate_count, but that would need caller to read and pass it down. Instead, recheck page->index against i_size, which is updated before unmap_mapping_range. Better check page->mapping too: not really necessary, but it's accidental that index is left when mapping is reset. Also, callers are expecting -EINVAL for beyond end of file, not -EAGAIN. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.7, 2004-07-28 22:57:50-07:00, sds@epoch.ncsc.mil [PATCH] selinux: fix clearing of new personality bit on security transitions This patch moves the clearing of the new personality bit from selinux_bprm_apply_creds (called from compute_creds) to selinux_bprm_set_security (called from prepare_binprm). This ensures that the bit is cleared at the same point in exec processing as for setuid/setgid binaries, prior to setting up the new image. Signed-off-by: Stephen Smalley Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.6, 2004-07-28 22:57:38-07:00, axboe@suse.de [PATCH] BIO page refcounting fix Hopefully fixes the free-of-a-freed-page BUG caused during CDRW writing. This also fixes a problem in the bouncing for io errors (it needs to free the pages and clear the BIO_UPTODATE flag, not set it. it's already set. passing -EIO to bio_endio() takes care of that). Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.5, 2004-07-28 22:57:26-07:00, arun.sharma@intel.com [PATCH] compat_clock_getres shouldn't return -EFAULT if res == NULL For clock_getres(clockid_t clock_id, struct timespec *res), the specification says "If res is NULL, the clock resolution is not returned." So this kind of call should succeed. The current implementation returns -EFAULT. The patch fixes the bug in compat_clock_getres(). Signed-off-by: Gordon Jin Signed-off-by: Arun Sharma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.4, 2004-07-28 22:57:15-07:00, steiner@sgi.com [PATCH] sched: initialize sched domain table Here is a trivial patch that is required to boot the latest 2.6.7 tree on the SGI 512p system. Initialize the busy_factor in the sched_domain_init table. Otherwise, booting hangs doing excessive load balance operations. Signed-off-by: Jack Steiner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.3, 2004-07-28 22:57:05-07:00, master@sectorb.msk.ru [PATCH] Fix UNIX98 pty indices leak I noticed that our PPPoE/PPtP access concentrator leaks pty devices. When all 4096 indices are leaked, there was need to reboot it. The following patch fixes this problem. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.2, 2004-07-28 22:56:54-07:00, nathanl@austin.ibm.com [PATCH] fixes for rcu_offline_cpu, rcu_move_batch rcu_offline_cpu and rcu_move_batch have been broken since the list_head's in struct rcu_head and struct rcu_data were replaced with singly-linked lists: CC kernel/rcupdate.o kernel/rcupdate.c: In function `rcu_move_batch': kernel/rcupdate.c:222: warning: passing arg 2 of `list_add_tail' from incompatible pointer type kernel/rcupdate.c: In function `rcu_offline_cpu': kernel/rcupdate.c:239: warning: passing arg 1 of `rcu_move_batch' from incompatible pointer type kernel/rcupdate.c:240: warning: passing arg 1 of `rcu_move_batch' from incompatible pointer type kernel/rcupdate.c:236: warning: label `unlock' defined but not used Kernel crashes when you try to offline a cpu, not surprisingly. It also looks like rcu_move_batch isn't preempt-safe so I touched that up, and got rid of an unused label in rcu_offline_cpu. Signed-off-by: Nathan Lynch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1814.1.1, 2004-07-28 22:48:26-07:00, torvalds@ppc970.osdl.org Merge bk://ppc.bkbits.net/for-linus-ppc into ppc970.osdl.org:/home/torvalds/v2.6/linux ChangeSet@1.1807.21.1, 2004-07-28 22:45:23-07:00, torvalds@ppc970.osdl.org Merge bk://gkernel.bkbits.net/misc-2.6 into ppc970.osdl.org:/home/torvalds/v2.6/linux ChangeSet@1.1807.2.51, 2004-07-29 00:16:47-05:00, stevef@smfhome1.smfdom [CIFS] Resize cifs request buffer mempools as tcp sessions are added to avoid potential deadlocks. Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.1807.16.8, 2004-07-28 21:30:54-07:00, davem@nuts.davemloft.net [SPARC64]: Do not duplicate compat dirent code. ChangeSet@1.1807.2.49, 2004-07-28 23:00:40-05:00, stevef@smfhome1.smfdom [CIFS] xattr support for cifs filesystem part 5 of 5, add removexattr capability Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.1807.17.15, 2004-07-28 19:07:06-07:00, shemminger@osdl.org [NET]: Convert pktgen to use module_param Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.17.14, 2004-07-28 19:06:32-07:00, shemminger@osdl.org [NET]: Convert ethertap to use module_param Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.17.12, 2004-07-28 18:56:51-07:00, nakam@linux-ipv6.org [IPSEC]: xfrm_user code forgets to call xfrm_probe_algs() Signed-off-by: Masahide Nakmura Signed-off-by: David S. Miller ChangeSet@1.1807.17.11, 2004-07-28 18:55:35-07:00, nacc@us.ibm.com [NET]: Use msleep() in sungem driver. Signed-off-by: Nishanth Aravamudan Signed-off-by: David S. Miller ChangeSet@1.1807.17.10, 2004-07-28 18:54:13-07:00, tv@tv.debian.net [BRIDGE]: Fix typo in br_stp.c Signed-off-by: Tommi Virtanen Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.17.9, 2004-07-28 18:49:15-07:00, kaber@trash.net [NET]: Remove useless variable in rtnetlink_rcv_msg Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1807.17.8, 2004-07-28 18:48:20-07:00, shemminger@osdl.org [NET]: Kill rtnl_exlock stubs. Rtnetlink has some macro's that are relics from earlier locking. They are only used a couple of places so are easy to kill. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.17.7, 2004-07-28 18:45:36-07:00, shemminger@osdl.org [PKT_SCHED]: de-inline qdiscipline locking functions This qdisc code has several inline functions for locking that is only used when adding/deleting queuing disciplines; so make them functions instead. The new qdisc_lock_tree encapsulates the locking used throughout this code. Also qdisc_run() is only called from net/core/dev.c so it should be defined there. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.16.7, 2004-07-28 18:39:13-07:00, davem@nuts.davemloft.net [SPARC64]: Update defconfig. ChangeSet@1.1807.16.6, 2004-07-28 18:29:47-07:00, davem@nuts.davemloft.net [SPARC64]: Simplify and optimize ultra3 memory copies. - Use one unrolled loop instead of two - Improve performance for well aligned copies smaller than 256 bytes - Use better named local label names so that diffing between the various instances is much easier to read - Reverify exception handling Signed-off-by: David S. Miller ChangeSet@1.1784.1.29, 2004-07-28 15:59:24-04:00, rmk+lkml@arm.linux.org.uk [PATCH] cirrusfb: discarded in section `.exit.text' from drivers/built-in.o This patch fixes the error in the subject line. ChangeSet@1.1807.20.1, 2004-07-28 17:57:12+00:00, aegl@agluck-lia64.sc.intel.com # Signed-off-by: Gordon Jin # Signed-off-by: Arun Sharma # Signed-off-by: Tony Luck ChangeSet@1.1784.1.28, 2004-07-28 13:27:25-04:00, linville@redhat.com [sound/oss i810] misc small changes Attached is a second patch to account for (most of) Herbert Xu's comments. I have left-out the part about changing state->card to a local variable where it is used a lot. Unfortunately, that usage is somewhat pervasive and I would prefer to make those changes in a separate patch -- after I have had a chance to do some testing. If you'd prefer one patch to account for the original plus these changes, let me know and I'll be happy to provide it. ChangeSet@1.1784.1.27, 2004-07-28 13:26:13-04:00, linville@redhat.com [sound/oss i810] add MMIO DSP support Enclosed is a patch for the i810_audio OSS driver to support using memory-mapped I/O for those chipsets that support it. o Added a family of macros -- I810_IOREADx() and I810_IOWRITEx() -- that key off the existing card->use_mmio flag to select between using readx/writex or inx/outx for I/O operations. o Converted existing inx/outx invocations to use I810_IOREADx/I810_IOWRITEx instead. o Changed GET_CIV(), GET_LVI, and CIV_TO_LVI() not only to use I810_IOREADx/I810_IOWRITEx but also to take "card" (i.e. struct i810_card) paramter. o Removed check for "Pure MMIO interfaces" in i810_probe() -- replaced w/ (relocated) check for no I/O resources available. ChangeSet@1.1807.19.2, 2004-07-28 13:17:36-04:00, achew@nvidia.com [ata] fix reversed bit definitions in linux/ata.h The macros ata_id_has_lba() and ata_id_has_dma() seem to have their bits reversed. LBA support is bit 9 of word 49 in the identify page, whereas DMA support is bit 8 of word 49 in the identify page. ChangeSet@1.1807.19.1, 2004-07-28 13:15:30-04:00, p.lavarre@ieee.org [PATCH] SATAPI despite no data I see we lost this source line in the changes since 2.6.7. But if I try SATAPI expecting no data without this source line, then my ata_piix.ko promptly dies with such complaints as: kernel: irq 18: nobody cared! With this source line, I find I can expect no data, though I still have to add auto sense to overcome: kernel: ata2: BUG: timeout without command ChangeSet@1.1807.18.4, 2004-07-29 02:07:10+09:00, yoshfuji@linux-ipv6.org [IPV6] add missing known icmpv6 types. Signed-off-by: Hideaki YOSHIFUJI ChangeSet@1.1807.18.3, 2004-07-29 02:04:10+09:00, yoshfuji@linux-ipv6.org [IPV6] fix the order of icmpv6 definitions for consistency. Signed-off-by: Hideaki YOSHIFUJI ChangeSet@1.1807.18.2, 2004-07-29 02:02:25+09:00, yoshfuji@linux-ipv6.org [IPV6] remove unused macro. ChangeSet@1.1807.18.1, 2004-07-29 02:00:59+09:00, yoshfuji@linux-ipv6.org [IPV6] fix typoes in macro definitions. Signed-Off-By: Hideaki YOSHIFUJI ChangeSet@1.1807.16.5, 2004-07-28 09:53:38-07:00, davem@nuts.davemloft.net [SPARC]: bbc_envctrl.c needs linux/delay.h ChangeSet@1.1807.17.6, 2004-07-28 09:01:51-07:00, herbert@gondor.apana.org.au [AH6]: Get things working again. Re: [AH6] Disable mutable bits after AH header Unfortunately I broke ah6_input() in that patch. Thanks to Miyazawa-san for notifying me of the problem. In that patch I removed the nh_offset parameter to ipv6_clear_mutable_options. That broke ah6_input() because it relies on that variable to set the nexthdr. The following patch fixes this by moving this work out to the caller xfrm6_rcv() where the information is already available. It also removes an unnecessary call to ip6_find_1stfragopt() in xfrm6_rcv() since nhoffp already points to the nexthdr preceding the current header. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1807.17.5, 2004-07-28 09:00:10-07:00, chas@cmf.nrl.navy.mil [ATM]: [lec] remove unnecessary inlines (from Adrian Bunk ) Signed-off-by: Adrian Bunk Signed-off-by: Chas Williams Signed-off-by: David S. Miller ChangeSet@1.1807.16.4, 2004-07-28 08:59:06-07:00, nacc@us.ibm.com [SPARC]: envctrl: Replace schedule_timeout() with msleep(). Signed-off-by: Nishanth Aravamudan Signed-off-by: David S. Miller ChangeSet@1.1807.16.3, 2004-07-28 08:57:10-07:00, nacc@us.ibm.com [SPARC]: bbc_envctrl: Replace schedule_timeout() with msleep(). Signed-off-by: Nishanth Aravamudan Signed-off-by: David S. Miller ChangeSet@1.1807.17.3, 2004-07-28 08:51:56-07:00, kernel@kolivas.org [IPV6]: Fix gcc-341 inlining for real. Signed-off-by: Con Kolivas Signed-off-by: Andrew Morton Signed-off-by: David S. Miller ChangeSet@1.1807.16.2, 2004-07-28 08:47:33-07:00, ahaas@airmail.net [SPARC32]: Remove duplicate pci_dma_mapping_error(). ChangeSet@1.1807.17.2, 2004-07-27 22:15:19-07:00, ak@suse.de [PATCH] x86-64 fixes This fixes several small but serious x86-64 bugs in 2.6.8rc2: - Fix array overflow in PCI bus checking (Travis Betak) - Fix broken pci_map_sg in swiotlb (Suresh B. Siddha) - Remove bogus bus check in IOMMU code Signed-off-by: Linus Torvalds ChangeSet@1.1807.8.11, 2004-07-28 00:36:33+02:00, sam@mars.ravnborg.org kbuild: Introduce source symlink in /lib/modules/.../ Traditionally when building a kernel the source and the output files are mixed. When building a kernel using the O= syntax to save output files in a separate directory a way is needed to locate the kernel source. The implemented solution is a new symlink 'source' being added to /lib/modules/.../ used to locate source for an installed kernel. The original symlink build points to the directory containing the output files. Please note that when the kernel is build with source and output files mixed the two symlinks 'build' and 'source' will point to the same directory, thus no changes compared to before. Two options was considered: a) Adding a new symlink pointing to the output files "object" => All external modules have to specify O= to build => External modules grepping in .config or .h files in include/asm needs to be updated => External modules that do grep in source code and ordinary header files just works b) Let the build symlink point to the output files and introduce a new symlink "source" pointing to the kernel source => External module can be build without specifying O= => External modules grepping in .config or .h files in include/asm just works => External modules that do grep in source code and ordinary header files needs to be updated Based on the above option b) is considered the least painfull alternative. So to sum up: - If a distro does not use separate output dir => no change - If a distro uses separate output dir => - Trivial external module just builds - Non-trivial (build-wise) external modules are probarly broken Without this patch - If a distro does not use separate output dir => no change - If a distro uses separate output dir => - Trivial external modules had to specify O= to build, and the directory being pointed at was not obvious - grep in .config or include files in asm/ required knowledge where to locate output files Preferred syntax for building external modules are the following: make -C /lib/modules/`uname -r`/build M=`pwd` [Substituting 'M=...' with 'SUBDIRS=... modules' give same effect]. When the kernel is built using separate output directory the above invocation of make will invoke the generated Makefile located in the output directory - that again will invoke the Makefile located in the kernel source tree root. Patch includes contributions from: Andreas Gruenbacher Signed-off-by: Sam Ravnborg ChangeSet@1.1807.8.10, 2004-07-27 23:54:53+02:00, sam@mars.ravnborg.org kbuild: Create Makefile in output directory if != kernel tree When building a kernel using the O= syntax to save output files in a separate output directory now create a small Makefile in that same dir. This Makefile allow one to use make in the output directory without the hassle of going back to the kernel source tree. The O= option is added by this Makefile stub. Please note that the Makefile silently overwrite an old one, so changes will be lost if modified. If there is a need to tweak a Makefile in the output directory it is recommended to use the filename 'makefile', which GNU Make will try first. Signed-off-by: Sam Ravnborg ChangeSet@1.1816, 2004-07-27 14:46:47-07:00, trini@kernel.crashing.org PPC32: Finish support for the EmbeddedPlanet RPX8260 board. From Dan Malek and myself. ChangeSet@1.1722.175.15, 2004-07-27 23:46:33+02:00, marcel@holtmann.org [Bluetooth] Replace schedule_timeout() with msleep() Use msleep() instead of schedule_timeout() to guarantee the task delays at least the desired time amount. Signed-off-by: Nishanth Aravamudan Signed-off-by: Marcel Holtmann ChangeSet@1.1807.8.9, 2004-07-27 23:44:01+02:00, sam@mars.ravnborg.org drivers: move STANDALONE to drivers/base/Kconfig Move STANDALONE from init/Kconfig to drivers/base/Kconfig . This way, it's besides PREVENT_FIRMWARE_BUILD. Signed-off-by: Adrian Bunk Signed-off-by: Sam Ravnborg ChangeSet@1.1722.175.14, 2004-07-27 23:42:21+02:00, marcel@holtmann.org [Bluetooth] Replace BCSP retransmitting message with BT_DBG The message "Timeout, retransmitting 1 pkts" is not an error and so change this into a debug message. Signed-off-by: Marcel Holtmann ChangeSet@1.1807.16.1, 2004-07-27 13:14:51-07:00, davem@nuts.davemloft.net Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6 into nuts.davemloft.net:/disk1/BK/sparc-2.6 ChangeSet@1.1807.14.2, 2004-07-27 12:55:12-07:00, davem@nuts.davemloft.net [SPARC64]: Kill all this silly inline memcpy handling. GCC does this well enough. Signed-off-by: David S. Miller ChangeSet@1.1807.6.84, 2004-07-27 12:24:01-04:00, margitsw@t-online.de [PATCH] prism54 Fix null pointer reference (Bug 100) * prism54_get/set_debug_oid are missing checks for a null pointer. Reported in Bugzilla number 100. ChangeSet@1.1807.6.83, 2004-07-27 12:23:53-04:00, margitsw@t-online.de [PATCH] prism54 Fix initialization with older firmware * In the card initialization routine, we try to set the output power. For firmware < 1.0.4.3, this leads to a worrying "mgt_commit has failed .." in the log although the device continues to react normally. Fix is simple, do not try to configure output power. (which I believe we should not be doing anyway as it is probably against local country regulations) ChangeSet@1.1807.6.82, 2004-07-27 12:23:44-04:00, margitsw@t-online.de [PATCH] prism54 Refix TRDY/RETRY_TIMEOUT * Reintroduce pushing 0 into the TRDY_TIMEOUT and RETRY_TIMEOUT registers. Make this configurable with module parameter init_pcitm. * We now have the ludicrous situation that some hardware setups require this (not even pushing 0xFF helps), whilst others don't care either way (the majority), and yet others bork if anything is pushed into these regs. If anybody can explain this (including Conexant :-) ), my ears are open. ChangeSet@1.1807.6.81, 2004-07-27 12:23:35-04:00, margitsw@t-online.de [PATCH] prism54 Fix reference to uninitialized pointer * oid_mgt.c is calling islpci_mgt_transaction passing the address of a pointer to the management frame. This is not being initialized by the caller. The callee only updates this pointer when successful. When not, boom. * Being ultracautious again, not only initialize in the caller, also null out the pointer unconditionally in the callee. ChangeSet@1.1807.3.17, 2004-07-27 06:02:46-05:00, stevef@steveft21.ltcsamba [CIFS] xattr support part 4 add set EA support Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.1807.2.47, 2004-07-26 22:26:59-07:00, davidm@tiger.hpl.hp.com ia64: Update for elf_read_implies_exec() macro changes in mainline tree. ChangeSet@1.1807.2.45, 2004-07-26 21:56:04-07:00, davidm@tiger.hpl.hp.com ia64: Update defconfig ChangeSet@1.1807.6.80, 2004-07-26 21:05:10-07:00, viro@www.linux.org.uk [PATCH] wrong ifdef in ppc/kernel/setup.c (nvram) Wrong ifdef around ppc nvram_read_byte() - it should be CONFIG_GENERIC_NVRAM. [that's it for today; there's more (fb stuff), but I'd rather make that a separate series] Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.79, 2004-07-26 21:04:59-07:00, viro@www.linux.org.uk [PATCH] cpumask updates in open_pic.c (ppc) compile fixes in open_pic.c - it missed cpumask conversion in several places. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.78, 2004-07-26 21:04:48-07:00, viro@www.linux.org.uk [PATCH] inline reordering in drivers/* usual "shift definition of inlines before their uses" in a couple of places in drivers/* Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.77, 2004-07-26 21:04:36-07:00, viro@www.linux.org.uk [PATCH] signed char fixes in drivers/* a couple of "replace char with explicit s8 to make sure it's really signed" fixes. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.76, 2004-07-26 21:04:25-07:00, viro@www.linux.org.uk [PATCH] drivers/ieee1394 annotation Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.75, 2004-07-26 21:04:13-07:00, viro@www.linux.org.uk [PATCH] broken stuff marked as such in Kconfig a) ppc KGDB builds only on two subarch; say so in Kconfig b) ide-pmac.c can't be a module; make it dependent on IDE=y. c) a bunch of isdn drivers is broken on ppc; marked as such d) oaknet is broken; marked as such (includes on files that do not exist, etc.) e) buslogic and cyber2000 are broken on sparc64 f) s3trio framebuffer is broken g) usual 8250-based serial is broken on sparc64; in principle it might be worth supporting (there are PCI cards of that sort), for now marked as broken (no asm/serial.h, to start with). Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.74, 2004-07-26 21:04:02-07:00, viro@www.linux.org.uk [PATCH] missing (void) in reiserfs on big-endian boxen Usual foo ? void : non-void in reiserfs; gets triggered on big-endian platforms. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.73, 2004-07-26 21:03:51-07:00, viro@www.linux.org.uk [PATCH] asm-ppc/reg.h namespace pollution fixes asm-ppc/reg.h defines pollutes namespace like there's no tomorrow; among other things there are LR SR0...SR15 DEC etc. That breaks quite a few drivers that should otherwise work on ppc. SR... and LR were never used by ppc code; commented out in reg.h (note that they are just aliases for SPRN_SR... and SPRN_LR). RPA commented out and its instances in ppc code (all four of them) replaced with SPRN_RPA. Ditto for DEC. The rest of the offenders (DAR and PVR) are left alone for now and #undef'ed in drivers in question. We probably want to rip all these guys out of reg.h and convert ppc users to SPRN_... forms - file ends up included in alot of places and namespace pollution like that is a Bad Thing(tm). Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.72, 2004-07-26 21:03:39-07:00, viro@www.linux.org.uk [PATCH] ffb_context annotation Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.71, 2004-07-26 21:03:29-07:00, viro@www.linux.org.uk [PATCH] pointer-to-int conversion fixes Assorted pointer-to-int fixes: a) some places want to take pointer modulo alignment or extract integer that was cast to pointer (which is legitimate), but do that via wrong cast, triggering sparse warnings. b) usual %x (int)ptr -> %p ptr fixes Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.70, 2004-07-26 21:03:17-07:00, viro@www.linux.org.uk [PATCH] drivers/macintosh annotations Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.69, 2004-07-26 21:03:05-07:00, viro@www.linux.org.uk [PATCH] via-velocity switched use of to if_mii() Either it got missed back when if_mii() was introduced, or it got merged that way later. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.68, 2004-07-26 21:02:54-07:00, viro@www.linux.org.uk [PATCH] dpt_i2o annotations Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.67, 2004-07-26 21:02:43-07:00, viro@www.linux.org.uk [PATCH] zoran switched to seq_file zoran procfs code switched to seq_file and cleaned up; a bunch of homegrown procfs glue eliminated. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.66, 2004-07-26 21:02:32-07:00, viro@www.linux.org.uk [PATCH] cciss compat ioctl fix cciss compat ioctls were broken (mixing kernel and userland pointers); fixed (and cleaned up) by switch to compat_alloc_user_space() and elimination of set_fs(). Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.65, 2004-07-26 21:02:20-07:00, viro@www.linux.org.uk [PATCH] annotations for arch/ppc and include/asm-ppc Usual set - explicit -D=1 for sparse, __sighandler_t / __sigrestore_t annotated, annotations in arch/ppc/kernel/*, etc. - same as for other platforms Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.64, 2004-07-26 21:02:09-07:00, viro@www.linux.org.uk [PATCH] #if abuses in drivers/* Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.63, 2004-07-26 21:01:57-07:00, viro@www.linux.org.uk [PATCH] CONFIG_MCOUNT fix for sparc64 CONFIG_MCOUNT on sparc64 is currently broken; we have both mcount and _mcount declared (and aliased to each other), but end up exporting the wrong one. As the result, with that option all modules get unresolved symbol. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.62, 2004-07-26 21:01:45-07:00, viro@www.linux.org.uk [PATCH] NULL noise removal in drivers/* it could be split (all chunks are obviously independent), but I don't think that it's worth doing. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.61, 2004-07-26 21:01:32-07:00, viro@www.linux.org.uk [PATCH] drm/gamma_old_dma.h fix blind dereferencing of userland pointer Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.60, 2004-07-26 21:01:20-07:00, viro@www.linux.org.uk [PATCH] NULL noise removal on ppc 0->NULL in arch/ppc and include/asm-ppc. [That's it for this series - there's still ~200Kb to merge, but I'd rather take a break for a couple of hours before dealing with the rest] Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.59, 2004-07-26 21:01:08-07:00, viro@www.linux.org.uk [PATCH] sparc32 emulation annotated annotated, a bunch of ioctls switched to compat_alloc_user_space() and cleaned up. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.58, 2004-07-26 21:00:57-07:00, viro@www.linux.org.uk [PATCH] solaris emulation annotated trivial annotations and cleanups + proper use of vfs_...stat(). Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.57, 2004-07-26 21:00:46-07:00, viro@www.linux.org.uk [PATCH] #if abuse in drivers/net/* Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.56, 2004-07-26 21:00:34-07:00, viro@www.linux.org.uk [PATCH] NULL noise removal in drivers/net/* That definitely duplicates a bunch of stuff in pending patches from various folks, but since it's all trivial 0->NULL replacements and patches are still not submitted and/or merged... Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.55, 2004-07-26 21:00:21-07:00, viro@www.linux.org.uk [PATCH] mtd fixes Assorted mtd fixes. a) NULL noise removal b) %p pointer instead of %x (int)pointer in printks c) missed iovec->kvec replacements (basically, fixing merge problems) d) fixed type for (unused) last argument in doc_{read,write}_ecc() e) sanitized some comparisons. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.54, 2004-07-26 21:00:10-07:00, viro@www.linux.org.uk [PATCH] impi annotation drivers/char/ipmi/* annotated, structure shared between kernel and userland (ioctls) split in two. ACPI callback in the same code used to have wrong type - it should've been void (...), not u32 (...). Fixed. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.53, 2004-07-26 20:59:59-07:00, viro@www.linux.org.uk [PATCH] bpck6 compile fix on ppc bpck6 was b0rken on ppc in rather amusing way - it used typedef struct ... PPC; which doesn't mix with having PPC (pre)defined to 1. Fixed by renaming private typedef in question. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.52, 2004-07-26 20:59:48-07:00, viro@www.linux.org.uk [PATCH] more NULL noise removal in fs/* Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.51, 2004-07-26 20:59:37-07:00, viro@www.linux.org.uk [PATCH] openpromfs annotation Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.50, 2004-07-26 20:59:25-07:00, viro@www.linux.org.uk [PATCH] security/selinux/hooks.c compile fix added missing #include Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.49, 2004-07-26 20:59:14-07:00, viro@www.linux.org.uk [PATCH] broken stuff in sound/* marked as such in Kconfig a) OSS is broken on sparc64 (as in "won't compile") b) sb16_csp is broken on ppc marked as such in Kconfig Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.48, 2004-07-26 20:59:03-07:00, viro@www.linux.org.uk [PATCH] misc sound/* fixes a) ALSA variant of wavefront didn't compile on gcc 2.x with debugging turned on - authors heard something about variadic macros on gcc 2.x, but screwed it up. Fixed. b) au88x0 relied on char being signed in non-trivial ways. On ppc it's not true. Fixed by explicit use of s8 (which is what that code really wants). Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.47, 2004-07-26 20:58:52-07:00, viro@www.linux.org.uk [PATCH] dmasound annotation dmasound (core + ppc-specific parts) annotated Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.46, 2004-07-26 20:58:41-07:00, viro@www.linux.org.uk [PATCH] check_region fixes A couple of old ISA drivers had trivial to fix check_region() uses. Sanitized. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.45, 2004-07-26 20:58:29-07:00, viro@www.linux.org.uk [PATCH] tea575 fix Very confused ioctl in tea575x - it is called via video_usercopy(), but assumes that it still has userland pointers. Fixed. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.44, 2004-07-26 20:58:17-07:00, viro@www.linux.org.uk [PATCH] #if abuse is sound/* Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.43, 2004-07-26 20:58:06-07:00, viro@www.linux.org.uk [PATCH] more NULL noise removal in sound/* Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.42, 2004-07-26 20:57:53-07:00, viro@www.linux.org.uk [PATCH] bluetooth annotations Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.41, 2004-07-26 20:57:42-07:00, viro@www.linux.org.uk [PATCH] rndis fix blind dereferencing of userland pointers in procfs ->write() in rndis.c Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.40, 2004-07-26 20:57:31-07:00, viro@www.linux.org.uk [PATCH] appletalk SIOCADDRT fix blind dereferencing of userland pointer in appletalk SIOCADDRT handling. Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.39, 2004-07-26 20:57:19-07:00, viro@www.linux.org.uk [PATCH] size_t portability fixes A lot of places assumed that size_t == unsigned; on 64bit boxen that is not true. Signed-off-by: Linus Torvalds ChangeSet@1.1807.2.44, 2004-07-26 16:37:27-07:00, davidm@tiger.hpl.hp.com ia64: Oops, SN2 needs pending_irq_cpumask to be global. ChangeSet@1.1807.3.15, 2004-07-26 16:58:23-05:00, stevef@steveft21.ltcsamba [CIFS] xattr support part 3 add query EA support to retrieve individual xattr values Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.1807.2.43, 2004-07-26 12:49:58-07:00, davidm@tiger.hpl.hp.com ia64: Clean up arch/ia64/kernel/irq.c a bit. ChangeSet@1.1807.2.42, 2004-07-26 12:43:40-07:00, kaneshige.kenji@jp.fujitsu.com [PATCH] ia64: fix bug in irq_affinity_write_proc() Writing 'R' or 'r' character to /proc/irq//smp_affinity cause a kernel Oops. The following patch fixes this issue. Signed-off-by: Kenji Kaneshige Signed-off-by: David Mosberger ChangeSet@1.1807.15.1, 2004-07-26 10:21:02-07:00, oleg@tv-sign.ru [PATCH] populate nonlinear mappings unconditionally filemap_populate and shmem_populate must install even a linear file_pte, in case there was a nonlinear page or file_pte already installed there: could only happen if already VM_NONLINEAR, but no need to check that. Acked by Ingo and Hugh. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds ChangeSet@1.1807.6.37, 2004-07-25 17:22:52-07:00, kernel@kolivas.org [IPV6]: Fix route.c gcc-3.4.x inlining error. Fixes the inline error when compiling net/ipv6/route.c with gcc-3.4.1 Signed-off-by: Con Kolivas Signed-off-by: David S. Miller ChangeSet@1.1807.6.36, 2004-07-25 16:54:54-07:00, kaber@trash.net [XFRM]: Wake up km_waitq once per gc-run instead of once per state. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1807.6.35, 2004-07-25 16:49:54-07:00, davem@nuts.davemloft.net Cset exclude: davem@nuts.davemloft.net|ChangeSet|20040723204655|22654 ChangeSet@1.1807.6.34, 2004-07-25 11:12:16-07:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] sparse: simplify and tighten sparse typechecking This takes advantage of the simplified typeof semantics of sparse address spaces, (should be enough for alpha, i386, ppc, ppc64, sparc, sparc64, x86_64 - most of them didn't actually need anything to be done) and couple of missing annotations that got caught by that. ChangeSet@1.1807.6.32, 2004-07-24 22:41:08-07:00, davem@nuts.davemloft.net [SCTP]: Fix mis-merge. ChangeSet@1.1807.6.31, 2004-07-24 22:31:11-07:00, anton@samba.org [NET]: Use NET_IP_ALIGN in acenic. Use NET_IP_ALIGN in acenic driver. Also remove the 16 byte padding, caches can be anywhere from 16 to 256 bytes and the skb should be cacheline aligned already. Signed-off-by: Anton Blanchard Signed-off-by: David S. Miller ChangeSet@1.1807.6.30, 2004-07-24 22:26:27-07:00, herbert@gondor.apana.org.au [AH6]: Replace skb by iph in clear_mutable_options. This patch replaces the skb argument in ipv6_clear_mutable_options() by an ipv6hdr. Doing so allows us to point skb->nh elsewhere when calling this function. I've also thrown in some obvious clean-ups for that function. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1807.6.29, 2004-07-24 22:24:48-07:00, herbert@gondor.apana.org.au [AH4]: Save daddr iff options are present. This is a little optimisation for AH4. When I moved the tunnel code out, I put the daddr copying code on the main path which is unnecessary since daddr is only mutable if IP options are present. This patch moves the saving and restoring of daddr under the check for the existence of IP options. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1807.6.28, 2004-07-24 22:19:43-07:00, davem@nuts.davemloft.net Cset exclude: shemminger@osdl.org|ChangeSet|20040722205059|21273 ChangeSet@1.1807.6.27, 2004-07-24 22:17:10-07:00, davem@nuts.davemloft.net Merge conflicts with Yoshfuji's SNMP stats changes. ChangeSet@1.1807.6.26, 2004-07-24 22:01:14-07:00, kaber@trash.net [IPV4/IPV6]: Add myself to MAINTAINERS. ChangeSet@1.1807.13.4, 2004-07-24 21:51:58-07:00, torvalds@ppc970.osdl.org ppc64: fix more 0/NULL confusion ChangeSet@1.1807.13.3, 2004-07-24 09:39:20-07:00, anton@samba.org [PATCH] ppc64: exception path optimisations - We were statically predicting syscalls would be 32bit which meant every 64bit syscall was guaranteed to be mispredicted. Just let the hardware predict this one. - We shouldnt use blrl for indirect function calls, it is unlikely to be predicted correctly and corrupts the link prediction stack. We should use bctrl instead. - Statically predict a branch in the system call path, favouring calls from userspace. - Remove static prediction in pagefault path, hardware prediction should do a better job here. Signed-off-by: Anton Blanchard Signed-off-by: Linus Torvalds ChangeSet@1.1807.13.2, 2004-07-24 09:38:05-07:00, anton@samba.org [PATCH] Fix ppc64 max_pfn issue - again It turns out in the non NUMA case, max_low_pfn doesnt get initialised until init_bootmem so we need to move initialisation of max_pfn below it. Signed-off-by: Anton Blanchard Signed-off-by: Linus Torvalds ChangeSet@1.1807.3.11, 2004-07-24 09:42:08-05:00, stevef@steveft21.ltcsamba [CIFS] xattr suport part 2: add listxattr support Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.1807.13.1, 2004-07-23 22:18:59-07:00, anton@samba.org [PATCH] Fix ppc64 max_pfn issue I noticed excessive time in the pid hash functions on a ppc64 box. It turns out the pid hash is being sized way too small, eg on a 16GB box: PID hash table entries: 16 (order 4: 256 bytes) The reason is that the pid hash init function uses max_pfn before it was setup on ppc64. With the following patch things are good again: PID hash table entries: 4096 (order 12: 65536 bytes) Signed-off-by: Anton Blanchard Signed-off-by: Linus Torvalds ChangeSet@1.1807.11.6, 2004-07-23 16:41:31-07:00, sri@us.ibm.com [SCTP] Mark chunks as ineligible for fast retransmit after they are retransmitted. Also mark any chunks that could not be fit in the PMTU sized packet as ineligible for fast retransmit. Signed-off-by: Sridhar Samudrala ChangeSet@1.1807.2.41, 2004-07-23 15:11:26-07:00, steiner@sgi.com [PATCH] ia64: Update function prototype for sn_io_addr Add "const" to function prototype for sn_io_addr. Cuts boot time on simulator in half. Signed-off-by: Jack Steiner Signed-off-by: David Mosberger ChangeSet@1.1807.6.24, 2004-07-23 14:14:25-07:00, shemminger@osdl.org [NET]: eql sparse cleanup. Minor 0 vs NULL cleanup Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.6.23, 2004-07-23 14:12:36-07:00, shemminger@osdl.org [IPVS]: Convert to module_param. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.6.22, 2004-07-23 13:46:55-07:00, davem@nuts.davemloft.net [PKT_SCHED]: Alpha not studly enough for SCH_CLK_CPU. The cycle counter it provides overflows very quickly, on the order of 10 minutes, so it is not suitable for this purpose. Signed-off-by: David S. Miller ChangeSet@1.1807.6.21, 2004-07-23 13:45:21-07:00, kaber@trash.net [PKT_SCHED]: Make clock source configurable Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1807.6.20, 2004-07-23 13:26:52-07:00, herbert@gondor.apana.org.au [AH6]: Disallow mutable bits after AH header. As we discussed before, mutable headers should not be allowed after the AH header. In fact, this appears to be the intention of RFC 2402. It is further clarified in section 3.1.1 of http://www.ietf.org/internet-drafts/draft-ietf-ipsec-rfc2402bis-07.txt This allows us to simplify the code in ah6.c. As a result, this also fixes the following issues: * Dependence on skb->h in ah6_output(). * Bogus clearing of auth_data of 2nd AH header in ipv6_clear_mutable_options(). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1807.6.19, 2004-07-23 13:23:48-07:00, herbert@gondor.apana.org.au [IPSEC]: Missing unlock in policy timer. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1807.6.17, 2004-07-23 10:26:36-07:00, davidm@napali.hpl.hp.com [PATCH] NX: allow architectures to select legacy mode dynamically On some platforms, you'll want to support READ_IMPLIES_EXEC differently depending on personality (e.g, native binary vs. x86 binary). This supports that (and makes the code more readable while at it) by replacing the old architecture-specific fixed LEGACY_BINARIES macro define with a architecture-specific "elf_read_implies_exec_binary()" helper function. For now, x86 is the only user, and sets the "read implies exec" bit for legacy apps. ia64 and x86-64 are likely to want to do their own thing. Acked by Ingo. Signed-off-by: Linus Torvalds ChangeSet@1.1807.11.5, 2004-07-22 23:22:01-07:00, sri@us.ibm.com [SCTP] Fix missing '+' in the computation of sack chunk size in sctp_sm_pull_sack(). Signed-off-by: Jorge Hernandez Signed-off-by: Sridhar Samudrala ChangeSet@1.1807.11.4, 2004-07-22 23:18:24-07:00, sri@us.ibm.com [SCTP] Use idr_get_new_above() with a starting id of 1 to avoid returning an associd of 0. Signed-off-by: Sridhar Samudrala ChangeSet@1.1807.11.3, 2004-07-22 23:15:55-07:00, sri@us.ibm.com [SCTP] Fix issues with handling stale cookie error over multihoming associations. Signed-off-by: Jorge Hernandez Signed-off-by: Sridhar Samudrala ChangeSet@1.1807.11.2, 2004-07-22 23:13:05-07:00, sri@us.ibm.com [SCTP] Fix data not being delivered to user in SHUTDOWN_SENT state. Also cleaned up sctp_sf_eat_data_6_2() and sctp_sf_eat_data_fast_4_4() as they have a lot of common code. Signed-off-by: Jorge Hernandez Signed-off-by: Sridhar Samudrala ChangeSet@1.1807.11.1, 2004-07-22 23:09:04-07:00, sri@us.ibm.com [SCTP] Set/Get default SCTP_PEER_ADDR_PARAMS for endpoint when associd and peer address are 0. Signed-off-by: Anand R. Setlur Signed-off-by: Sridhar Samudrala ChangeSet@1.1807.9.8, 2004-07-22 18:41:58-07:00, davem@nuts.davemloft.net [SPARC64]: Uninline _raw_spin_lock too, saves ~30K in defconfig image. ChangeSet@1.1807.6.16, 2004-07-22 18:38:29-07:00, torvalds@ppc970.osdl.org Make "install_page()" able to handle truncated pages. This makes it much easier on the callers, no need to worry about races with vmtruncate() and friends, since "install_page()" will just cleanly handle that case and tell the caller about it. ChangeSet@1.1807.6.15, 2004-07-22 17:26:50-07:00, apw@shadowen.org [PATCH] is_highmem() and WANT_PAGE_VIRTUAL Add is_highmem_idx() and is_normal_idx() to determine whether a zone index is a highmem or normal zone. Use this for memmap_init_zone(). Signed-off-by: Andy Whitcroft Signed-off-by: Linus Torvalds ChangeSet@1.1807.10.2, 2004-07-22 17:20:03-07:00, kaber@trash.net [PKT_SCHED]: Use get_cycles() for PSCHED_CPU clock source Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1807.6.14, 2004-07-22 17:14:12-07:00, Roman.Fietze@telemotive.de [PATCH] clean up n_tty alloc_buf() Don't bother zeroing the allocated memory inside alloc_buf() in the n_tty line discipline. alloc_buf() is static inline and is only referenced by n_tty_open() which always clears the memory (once more). No bug, just a minor cleanup ChangeSet@1.1807.6.13, 2004-07-22 17:14:00-07:00, linux@dominikbrodowski.de [PATCH] Asus M2N notebook hides SMBus device Asus also "hides" the LPC bridge on M2N notebooks. Add it to the asus_hides_smbus PCI quirk. Fixes bug #2976 @ http://bugme.osdl.org/show_bug.cgi?id=2976 Signed-off-by: Dominik Brodowski Signed-off-by: Linus Torvalds ChangeSet@1.1807.10.1, 2004-07-22 17:13:11-07:00, kaber@trash.net [PKT_SCHED]: Remove dead timer code. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1807.6.12, 2004-07-22 17:01:38-07:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] Missing mnt_namespace update in copy_namespace() copy_namespace() forgets to switch the new 'mnt_namespace' field in the vfsmounts of the new namespace. ChangeSet@1.1807.8.8, 2004-07-23 01:29:55+02:00, kkourt@cslab.ece.ntua.gr kbuild: Two simple kbuild patches foo1.patch: spelling correction in Makefile foo2.patch: replace SUBDIRS with M in Documentation/kbuild/modules.txt From: Kornilios Kourtis Signed-off-by: Sam Ravnborg ChangeSet@1.1807.8.7, 2004-07-23 01:28:19+02:00, sam@mars.ravnborg.org kbuild: Fix up moving of modpost A few small issues to fix the moving of modpost. A few files was missing in the commit and one change needed. Also bk ignored the files in their new location. Signed-off-by: Sam Ravnborg ChangeSet@1.1807.8.6, 2004-07-23 00:59:36+02:00, bgerst@didntduck.org kbuild: Move modpost files to a new subdir scripts/mod Move modpost and support files to scripts/mod. Directory named mod by Sam. From: Brian Gerst Signed-off-by: Sam Ravnborg ChangeSet@1.1807.8.5, 2004-07-23 00:39:37+02:00, schwab@suse.de kbuild: scripts/genksyms/parse.c_shipped needs to be rebuilt parse.c_shipped has never been regenerated after parse.y has been modified 4 months ago. Signed-off-by: Andreas Schwab Signed-off-by: Sam Ravnborg ChangeSet@1.1807.8.4, 2004-07-23 00:32:23+02:00, sam@mars.ravnborg.org kbuild: Less intrusive LANG override, fixes menuconfig The locale override caused problems for some people with locale setiings different from 'C'. make menuconfig was looking bad / unuseable. This patch limit the override of locales to the part where we actually descend the kernel doing the full build of the kernel. The speed improvement is the same. make menuconfig should now be useable for all locale settings again. Thanks to Marcel Sebek for pointing out this problem and being paitent in testing. Signed-off-by: Sam Ravnborg ChangeSet@1.1807.6.10, 2004-07-22 14:01:38-07:00, davem@nuts.davemloft.net [TCP]: Do not overflow 16-bit window field in tcp_select_window(). Signed-off-by: David S. Miller ChangeSet@1.1807.6.9, 2004-07-22 13:50:59-07:00, shemminger@osdl.org [PKT_SCHED]: Fix pkt_cls.h incompatabilities The recent changes to (6 Jul 04) pkt_cls.h are evil, you can't build a version of 'tc' to work unless you know the kernel config! It has several API problems: - API data structures change on kernel config options - new fields should be added at the end of a structure to allow binary compatibility. This patch tries to clean this up. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.6.8, 2004-07-22 12:16:19-07:00, herbert@gondor.apana.org.au [INET]: Create enum of ECN bits This patch is a preparation for an update of the ECN encap/decap code with respect to RFC3168. It creates an enum of the four code-points defined by RFC3168 and uses them throughout the inet_ecn.h file. The only non-trivial bit is in IP_ECN_set_ce/IP6_ECN_set_ce where the patch uses INET_ECN_CE instead of 1. This is OK as those functions assume that the ECT bit is already set. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1807.6.7, 2004-07-22 12:14:36-07:00, herbert@gondor.apana.org.au [IPSEC]: Fix IPCOMP6 ICMP type check. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.1807.6.6, 2004-07-21 17:18:28-07:00, davem@nuts.davemloft.net [ATM]: Update Marko Kiiskila's email address. ChangeSet@1.1807.6.5, 2004-07-21 16:47:01-07:00, davem@nuts.davemloft.net [IPV4]: Make raw sockets behave like udp wrt. MSG_TRUNC. ChangeSet@1.1807.6.4, 2004-07-21 16:08:53-07:00, chas@relax.cmd.nrl.navy.mil [ATM]: use try_module_get appropriately (from Stephen Hemminger ) ChangeSet@1.1807.6.3, 2004-07-21 15:55:16-07:00, davem@nuts.davemloft.net Merge bk://bk.skbuff.net:20608/linux-2.6-dgramconnect/ into nuts.davemloft.net:/disk1/BK/net-2.6 ChangeSet@1.1807.7.7, 2004-07-21 14:51:31-07:00, herbert@gondor.apana.org.au [CRYPTO]: Fix stack overrun in crypt(). The stack allocation in crypt() is bogus as whether tmp_src/tmp_dst is used is determined by factors unrelated to nbytes and src->length/dst->length. Since the condition for whether tmp_src/tmp_dst are used is very complex, let's allocate them always instead of guessing. This fixes a number of weird crashes including those AES crashes that people have been seeing with the 2.4 backport + ipt_conntrack. Signed-off-by: Herbert Xu Signed-off-by: James Morris Signed-off-by: David S. Miller ChangeSet@1.1807.9.7, 2004-07-21 14:27:07-07:00, wli@holomorphy.com [SPARC32]: Mark William Lee Irwin III as maintainer. ChangeSet@1.1807.7.6, 2004-07-21 13:51:01-07:00, Samuel.Thibault@ens-lyon.fr [UDP]: Return true length if user specifies MSG_TRUNC. ChangeSet@1.1807.9.6, 2004-07-21 13:44:37-07:00, tcallawa@redhat.com [SPARC]: Add pci_dma_mapping_error to pci.h Signed-off-by: Tom Callaway Signed-off-by: David S. Miller ChangeSet@1.1807.9.5, 2004-07-21 13:42:08-07:00, tcallawa@redhat.com [SPARC]: Fix copy_user.S with gcc 3.3 Signed-off-by: Tom Callaway Signed-off-by: David S. Miller ChangeSet@1.1807.7.5, 2004-07-21 13:41:01-07:00, shemminger@osdl.org [IPV6]: Missing sparse annotation in addrconf. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.7.4, 2004-07-21 13:34:49-07:00, shemminger@osdl.org [PKT_SCHED]: Need delayed packet limit in sch_netem. The netem scheduler needs to limit its delayed packet queue to prevent a application burst from chewing up too much memory. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.7.3, 2004-07-21 13:33:42-07:00, shemminger@osdl.org [PKT_SCHED]: Missing qdisc destroy in sch_netem. The underlying qdisc was not being properly destroyed, shows up as assertion failure on device removal. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.7.2, 2004-07-21 13:31:05-07:00, shemminger@osdl.org [PKT_SCHED]: Make sch_netem classful. Simple enhancement to netem packet scheduler that makes it classful so that the underlying pfifo default discipline can be substituted with something else (tbf, red, ...) Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1807.9.4, 2004-07-21 13:27:12-07:00, dave@thedillows.org [SPARC64]: Handle SBUS dma allocations larger than 1MB. Signed-off-by: David Dillow Signed-off-by: David S. Miller ChangeSet@1.1807.9.3, 2004-07-21 13:12:56-07:00, davem@nuts.davemloft.net [SPARC64]: Fix allnoconfig build, based upon a patch from Roland Dreier. - Make SUNOS_EMUL depend upon BINFMT_AOUT32 - Make SOLARIS_EMUL depend upon SPARC32_COMPAT - Add CONFIG_COMPAT guards, where necessary. Signed-off-by: David S. Miller ChangeSet@1.1807.9.2, 2004-07-20 15:57:37-07:00, davem@nuts.davemloft.net [SPARC64]: Update defconfig. ChangeSet@1.1807.9.1, 2004-07-20 15:55:45-07:00, davem@nuts.davemloft.net [SPARC64]: Export __copy_in_user to modules. ChangeSet@1.1807.8.3, 2004-07-21 00:14:47+02:00, sam@mars.ravnborg.org kbuild: Rebuild .spec file when kernel version changes Make a dependency in scripts/package/Makefile to top-level Makefile forcing .spec file to be generated when kernel version changes. Signed-off-by: Sam Ravnborg ChangeSet@1.1807.8.2, 2004-07-21 00:03:20+02:00, gdavis@mvista.com kbuild: Allow `make O= {cscope,tags}` to work Allow `make O= {cscope,tags}` to work ChangeSet@1.1807.8.1, 2004-07-20 23:57:07+02:00, edwardsg@sgi.com kbuild: build binary rpm from pre-built tree Many times it would be nice to quickly package up a kernel tree you're working on, without having to rebuild the whole thing again from a clean source tree (like the current rpm-pkg target does). The patch below adds an "binrpm-pkg" target which uses your existing (already built) tree. Modified by me to always do a make and use binrpm-pkg. Signed-off-by: Greg Edwards Signed-off-by: Sam Ravnborg ChangeSet@1.1807.7.1, 2004-07-20 14:55:45-07:00, davem@nuts.davemloft.net Merge bk://bk.skbuff.net:20608/linux-2.6-snmp-20040708 into nuts.davemloft.net:/disk1/BK/snmp-2.6 ChangeSet@1.1807.2.40, 2004-07-20 14:07:48-07:00, jbarnes@sgi.com [PATCH] ia64: sn2 requires a 3.40 or better PROM The SGI 3.40 PROM includes a fix for the move of the init_task to region 5, so specify that in sn_sal.h. Unfortunately, the check for the minimum required version happens *after* the hang/MCA that is symptomatic of the bug, so this message also acts as an announcement of the requirement. Signed-off-by: Jesse Barnes Signed-off-by: David Mosberger ChangeSet@1.1807.2.38, 2004-07-19 12:27:06-07:00, jbarnes@engr.sgi.com [PATCH] ia64: update sn2_defconfig to include new console Now that Linus' tree has the new sn2 console driver, make sn2_defconfig enable it by default. The device is major 204, minor 40. Note that you'll probably have to update your elilo.conf and inittab to use the new driver, as it's called ttySG0 rather than ttyS0. Signed-off-by: Jesse Barnes Signed-off-by: David Mosberger ChangeSet@1.1815, 2004-07-19 09:47:34-07:00, trini@kernel.crashing.org PPC32: Typo fix in m8xx serial driver. ChangeSet@1.1807.6.2, 2004-07-19 23:25:15+09:00, yoshfuji@linux-ipv6.org [IPV6] remove rather pointless comment. Signed-off-by: Hideaki YOSHIFUJI ChangeSet@1.1807.6.1, 2004-07-19 23:16:36+09:00, yoshfuji@linux-ipv6.org [IPV4] Look up route with appropriate protocol when we connect(). Signed-off-by: Hideaki YOSHIFUJI ChangeSet@1.1807.3.10, 2004-07-18 22:26:25-05:00, stevef@smfhome.smfdom [CIFS] remove unneeded, unused prototypes. Suggested by Carl Spalletta Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.1807.5.1, 2004-07-18 17:23:42-05:00, stevef@smfhome.smfdom CIFS: Add missing mount option for optionally cifs perm checks when uids on server and client do not match and for optionally overriding server setting default uid/gid of new cifs files and directories. Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.1807.3.8, 2004-07-18 09:08:19-07:00, mingo@elte.hu [PATCH] NX: clean up legacy binary support This cleans up legacy x86 binary support by introducing a new personality bit: READ_IMPLIES_EXEC, and implements Linus' suggestion to add the PROT_EXEC bit on the two affected syscall entry places, sys_mprotect() and sys_mmap(). If this bit is set then PROT_READ will also add the PROT_EXEC bit - as expected by legacy x86 binaries. The ELF loader will automatically set this bit when it encounters a legacy binary. This approach avoids the problems the previous ->def_flags solution caused. In particular this patch fixes the PROT_NONE problem in a cleaner way (http://lkml.org/lkml/2004/7/12/227), and it should fix the ia64 PROT_EXEC problem reported by David Mosberger. Also, mprotect(PROT_READ) done by legacy binaries will do the right thing as well. the details: - the personality bit is added to the personality mask upon exec(), within the ELF loader, but is not cleared (see the exceptions below). This means that if an environment that already has the bit exec()s a new-style binary it will still get the old behavior. - one exception are setuid/setgid binaries: these will reset the bit - thus local attackers cannot manually set the bit and circumvent NX protection. Legacy setuid binaries will still get the bit through the ELF loader. This gives us maximum flexibility in shaping compatibility environments. - selinux also clears the bit when switching SIDs via exec(). - x86 is the only arch making use of READ_IMPLIES_EXEC currently. Other arches will have the pre-NX-patch protection setup they always had. I have booted an old distro [RH 7.2] and two new PT_GNU_STACK distros [SuSE 9.2 and FC2] on an NX-capable CPU - they work just fine and all the mapping details are right. I've checked the PROT_NONE test-utility as well and it works as expected. I have checked various setuid scenarios as well involving legacy and new-style binaries. an improved setarch utility can be used to set the personality bit manually: http://redhat.com/~mingo/nx-patches/setarch-1.4-3.tar.gz the new '-X' flag does it, e.g.: ./setarch -X linux /bin/cat /proc/self/maps will trigger the old protection layout even on a new distro. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds ChangeSet@1.1807.3.7, 2004-07-18 09:06:48-07:00, eger@havoc.gtf.org [PATCH] pmac_zilog: serial minors taken failure path fix I've tracked down the core issue giving me the oops wrt pmac_zilog. When you have two serial drivers, (e.g. 8250 and PMAC_ZILOG) they both say "I want to reserve X ports starting with major TTY_MAJOR and minor 64". By the time pmac_zilog gets there, the ports it requests are already reserved. Unfortunately, init_pmz() doesn't check for pmz_register() failure, and so it merrily goes on to register the half-initialized pmac_zilog driver with the power management subsystem. This path provides a proper failure path. Also: Restore ppc configs now that I know people use AT Keyboards on CHRP and PReP machines, and the zilog driver is no longer Oops'ing. Signed-off-by: David Eger Signed-off-by: Linus Torvalds ChangeSet@1.1807.3.6, 2004-07-17 21:52:45-07:00, torvalds@ppc970.osdl.org Linux 2.6.8-rc2 Ready for the kernel summit in Ottawa... TAG: v2.6.8-rc2