| a2e2a59 | David S. Miller | 05 July 2005, 22:19:23 UTC | [TCP]: Fix redundant calculations of tcp_current_mss() tcp_write_xmit() uses tcp_current_mss(), but some of it's callers, namely __tcp_push_pending_frames(), already has this value available already. While we're here, fix the "cur_mss" argument to be "unsigned int" instead of plain "unsigned". Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:19:23 UTC |
| 92df7b5 | David S. Miller | 05 July 2005, 22:19:06 UTC | [TCP]: tcp_write_xmit() tabbing cleanup Put the main basic block of work at the top-level of tabbing, and mark the TCP_CLOSE test with unlikely(). Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:19:06 UTC |
| a762a98 | David S. Miller | 05 July 2005, 22:18:51 UTC | [TCP]: Kill extra cwnd validate in __tcp_push_pending_frames(). The tcp_cwnd_validate() function should only be invoked if we actually send some frames, yet __tcp_push_pending_frames() will always invoke it. tcp_write_xmit() does the call for us, so the call here can simply be removed. Also, tcp_write_xmit() can be marked static. Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:18:51 UTC |
| f44b527 | David S. Miller | 05 July 2005, 22:18:34 UTC | [TCP]: Add missing skb_header_release() call to tcp_fragment(). When we add any new packet to the TCP socket write queue, we must call skb_header_release() on it in order for the TSO sharing checks in the drivers to work. Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:18:34 UTC |
| 84d3e7b | David S. Miller | 05 July 2005, 22:18:18 UTC | [TCP]: Move __tcp_data_snd_check into tcp_output.c It reimplements portions of tcp_snd_check(), so it we move it to tcp_output.c we can consolidate it's logic much easier in a later change. Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:18:18 UTC |
| f6302d1 | David S. Miller | 05 July 2005, 22:18:03 UTC | [TCP]: Move send test logic out of net/tcp.h This just moves the code into tcp_output.c, no code logic changes are made by this patch. Using this as a baseline, we can begin to untangle the mess of comparisons for the Nagle test et al. We will also be able to reduce all of the redundant computation that occurs when outputting data packets. Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:18:03 UTC |
| fc6415b | David S. Miller | 05 July 2005, 22:17:45 UTC | [TCP]: Fix quick-ack decrementing with TSO. On each packet output, we call tcp_dec_quickack_mode() if the ACK flag is set. It drops tp->ack.quick until it hits zero, at which time we deflate the ATO value. When doing TSO, we are emitting multiple packets with ACK set, so we should decrement tp->ack.quick that many segments. Note that, unlike this case, tcp_enter_cwr() should not take the tcp_skb_pcount(skb) into consideration. That function, one time, readjusts tp->snd_cwnd and moves into TCP_CA_CWR state. Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:17:45 UTC |
| c65f7f0 | David S. Miller | 05 July 2005, 22:17:25 UTC | [TCP]: Simplify SKB data portion allocation with NETIF_F_SG. The ideal and most optimal layout for an SKB when doing scatter-gather is to put all the headers at skb->data, and all the user data in the page array. This makes SKB splitting and combining extremely simple, especially before a packet goes onto the wire the first time. So, when sk_stream_alloc_pskb() is given a zero size, make sure there is no skb_tailroom(). This is achieved by applying SKB_DATA_ALIGN() to the header length used here. Next, make select_size() in TCP output segmentation use a length of zero when NETIF_F_SG is true on the outgoing interface. Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:17:25 UTC |
| b8259d9 | Alexey Dobriyan | 05 July 2005, 22:12:04 UTC | [NET]: Remove __ARGS from include/net/slhc_vj.h I suspect "#define __ARGS(x) ()" was deprecated before I was born. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:12:04 UTC |
| 52609c0 | David Chau | 05 July 2005, 22:11:06 UTC | [NET]: improve readability of dev_set_promiscuity() in net/core/dev.c A trivial patch to improve the readability of dev_set_promiscuity() in net/core/dev.c. New code does exactly the same thing as original code. Signed-off-by: David Chau <ddcc@mit.edu> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:11:06 UTC |
| bc971de | Christoph Hellwig | 05 July 2005, 22:03:46 UTC | [SHAPER]: Switch to spinlocks. Dave, you were right and the sleeping locks in shaper were broken. Markus Kanet noticed this and also tested the patch below that switches locking to spinlocks. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:03:46 UTC |
| 2f36895 | Robert Olsson | 05 July 2005, 22:02:40 UTC | [IPV4]: More broken memory allocation fixes for fib_trie Below a patch to preallocate memory when doing resize of trie (inflate halve) If preallocations fails it just skips the resize of this tnode for this time. The oops we got when killing bgpd (with full routing) is now gone. Patrick memory patch is also used. Signed-off-by: Robert Olsson <robert.olsson@its.uu.se> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:02:40 UTC |
| db1322b | Thomas Graf | 05 July 2005, 22:01:25 UTC | [DECNET]: Fix memset overflow on 64bit archs while dumping decnet routing rules Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:01:25 UTC |
| bb1d23b | Eric Dumazet | 05 July 2005, 22:00:32 UTC | [IPV4]: Bug fix in rt_check_expire() - rt_check_expire() fixes (an overflow occured if size of the hash was >= 65536) reminder of the bugfix: The rt_check_expire() has a serious problem on machines with large route caches, and a standard HZ value of 1000. With default values, ie ip_rt_gc_interval = 60*HZ = 60000 ; the loop count : for (t = ip_rt_gc_interval << rt_hash_log; t >= 0; overflows (t is a 31 bit value) as soon rt_hash_log is >= 16 (65536 slots in route cache hash table). In this case, rt_check_expire() does nothing at all Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 22:00:32 UTC |
| 424c4b7 | Eric Dumazet | 05 July 2005, 21:58:19 UTC | [IPV4]: Use the fancy alloc_large_system_hash() function for route hash table - rt hash table allocated using alloc_large_system_hash() function. Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:58:19 UTC |
| 22c047c | Eric Dumazet | 05 July 2005, 21:55:24 UTC | [NET]: Hashed spinlocks in net/ipv4/route.c - Locking abstraction - Spinlocks moved out of rt hash table : Less memory (50%) used by rt hash table. it's a win even on UP. - Sizing of spinlocks table depends on NR_CPUS Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:55:24 UTC |
| f0e36f8 | Patrick McHardy | 05 July 2005, 21:44:55 UTC | [IPV4]: Handle large allocations in fib_trie Inflating a node a couple of times makes it exceed the 128k kmalloc limit. Use __get_free_pages for allocations > PAGE_SIZE, as in fib_hash. Signed-off-by: Patrick McHardy <kaber@trash.net> Acked-by: Robert Olsson <Robert.Olsson@data.slu.se> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:44:55 UTC |
| 93e266f | David S. Miller | 05 July 2005, 21:43:19 UTC | [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:43:19 UTC |
| d244c89 | Michael Chan | 05 July 2005, 21:42:33 UTC | [TG3]: support for ethtool -C Add support for ethtool -C with verification of user parameters. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:42:33 UTC |
| e2ed405 | Herbert Xu | 05 July 2005, 21:41:20 UTC | [IPV6]: Makes IPv6 rcv registration happen last during initialisation. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:41:20 UTC |
| 30e224d | Herbert Xu | 05 July 2005, 21:40:10 UTC | [IPV4]: Fix crash in ip_rcv while booting related to netconsole Makes IPv4 ip_rcv registration happen last in af_inet. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:40:10 UTC |
| a31488c | David S. Miller | 05 July 2005, 21:24:35 UTC | [SKGE]: Fix build on big-endian Missing PCI_REV_DESC define. Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:24:35 UTC |
| 023e09a | Thomas Graf | 05 July 2005, 21:15:53 UTC | [PKT_SCHED]: Report rate estimator configuration errors during qdisc allocation Current behaviour is to not report an error if a rate estimator is created together with a qdisc and the configuration of the rate estimator is bogus. This leads to unexpected behaviour because the user is not notified. New behaviour is to report the error and let the whole qdisc creation operation fail so the user is able to fix his mistake. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:15:53 UTC |
| 3d54b82 | Thomas Graf | 05 July 2005, 21:15:09 UTC | [PKT_SCHED]: Cleanup qdisc creation and alignment macros Adds qdisc_alloc() to share code between qdisc_create() and qdisc_create_dflt(). Hides the qdisc alignment behind macros and makes use of them. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:15:09 UTC |
| e41a33e | Thomas Graf | 05 July 2005, 21:14:30 UTC | [PKT_SCHED]: Move sch_generic.c prototypes to correct header file Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:14:30 UTC |
| 1cbb338 | Thomas Graf | 05 July 2005, 21:13:41 UTC | [NET]: Reduce size of sk_buff by 4 bytes Reduce local_df to a bit field and ip_summed to a 2 bits field thus saving 13 bits. Move bit fields, packet type, and protocol into the spare area between the priority and the destructor. Saves 4 bytes on both, 32bit and 64bit architectures. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:13:41 UTC |
| e176fe8 | Thomas Graf | 05 July 2005, 21:12:44 UTC | [NET]: Remove unused security member in sk_buff Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:12:44 UTC |
| 3154e54 | Patrick McHardy | 05 July 2005, 21:10:40 UTC | [NET]: net/core/filter.c: make len cover the entire packet As suggested by Herbert Xu: Since we don't require anything to be in the linear packet range anymore make len cover the entire packet. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:10:40 UTC |
| 0b05b2a | Patrick McHardy | 05 July 2005, 21:10:21 UTC | [NET]: Consolidate common code in net/core/filter.c Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:10:21 UTC |
| 6935d46 | Patrick McHardy | 05 July 2005, 21:08:57 UTC | [NET]: Remove redundant code in net/core/filter.c skb_header_pointer handles linear and non-linear data, no need to handle linear data again. Signed-off-by: Patrick McHardy <kaber@trash.net> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:08:57 UTC |
| 55820ee | Patrick McHardy | 05 July 2005, 21:08:10 UTC | [NET]: Fix signedness issues in net/core/filter.c This is the code to load packet data into a register: k = fentry->k; if (k < 0) { ... } else { u32 _tmp, *p; p = skb_header_pointer(skb, k, 4, &_tmp); if (p != NULL) { A = ntohl(*p); continue; } } skb_header_pointer checks if the requested data is within the linear area: int hlen = skb_headlen(skb); if (offset + len <= hlen) return skb->data + offset; When offset is within [INT_MAX-len+1..INT_MAX] the addition will result in a negative number which is <= hlen. I couldn't trigger a crash on my AMD64 with 2GB of memory, but a coworker tried on his x86 machine and it crashed immediately. This patch fixes the check in skb_header_pointer to handle large positive offsets similar to skb_copy_bits. Invalid data can still be accessed using negative offsets (also similar to skb_copy_bits), anyone using negative offsets needs to verify them himself. Thanks to Thomas V\xf6gtle <thomas.voegtle@coreworks.de> for verifying the problem by crashing his machine and providing me with an Oops. Signed-off-by: Patrick McHardy <kaber@trash.net> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> | 05 July 2005, 21:08:10 UTC |
| 17af691 | Russell King | 04 July 2005, 12:02:46 UTC | [PATCH] ARM: Fix new-ABI layout of struct stat64 Add __attribute__((packed)) to ensure that the stat64 structure is correctly laid out no matter which ABI the kernel is compiled for. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 04 July 2005, 12:02:46 UTC |
| 68070bd | Russell King | 04 July 2005, 09:44:34 UTC | [PATCH] ARM: Fix non-standard PXA io_pg_offst initialisers These didn't match my sed expression correctly, fix them up manually. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 04 July 2005, 09:44:34 UTC |
| f9bd6ea | Russell King | 04 July 2005, 09:43:36 UTC | [PATCH] ARM: Change 'param_offset' to 'boot_params' Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 04 July 2005, 09:43:36 UTC |
| 19f7241 | Linus Torvalds | 03 July 2005, 21:39:33 UTC | Merge master.kernel.org:/home/rmk/linux-2.6-arm | 03 July 2005, 21:39:33 UTC |
| 08ab8c2 | Linus Torvalds | 03 July 2005, 21:37:09 UTC | Merge master.kernel.org:/home/rmk/linux-2.6-serial | 03 July 2005, 21:37:09 UTC |
| 976ecd1 | Russell King | 03 July 2005, 20:05:45 UTC | [PATCH] Serial: Fix console port spinlock initialisation Initialise the spinlock for port being used by the console early, but don't re-initialise it again later. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 03 July 2005, 20:05:45 UTC |
| 0d670b4 | Catalin Marinas | 03 July 2005, 16:53:25 UTC | [PATCH] ARM: 2784/1: Fix the block cache flush operation range Patch from Catalin Marinas The range for the ARMv6 block cache operations is inclusive but the kernel doesn't re-calculate the end address, causing a page fault when used (this only happens with support for cache aliasing, otherwise the blk_flush_kern_dcache_page() is not called). This patch subtracts L1_CACHE_BYTES from the end address. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 03 July 2005, 16:53:25 UTC |
| 75f631d | Ben Dooks | 03 July 2005, 16:44:40 UTC | [PATCH] ARM: 2785/1: S3C24XX - serial calls request_irq() with IRQs disabled Patch from Ben Dooks The request_irq() function is called by s3c24xx uart driver with the local IRQs disabled. The request_irq() function can allocate memory via kmalloc(), and this may sleep causing a warning about sleeping in an invalid context. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 03 July 2005, 16:44:40 UTC |
| e9dea0c | Russell King | 03 July 2005, 16:38:58 UTC | [PATCH] ARM: Remove machine description macros Remove the pointless machine description macros, favouring C99 initialisers instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 03 July 2005, 16:38:58 UTC |
| 10e047b | Adrian Bunk | 03 July 2005, 15:44:10 UTC | [PATCH] drivers/ide/Makefile: kill dead CONFIG_BLK_DEV_IDE_TCQ entry This patch kills the dead CONFIG_BLK_DEV_IDE_TCQ entry. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 15:44:10 UTC |
| 21e2c01 | Rob Punkunus | 03 July 2005, 15:37:18 UTC | [PATCH] amd74xx: support MCP55 device IDs From: Rob Punkunus <rpunkunus@nvidia.com> Rob Punkunus recently submitted a patch to enable support for MCP51/MCP55 in the amd74xx driver. This patch was whitespace-corrupted and didn't apply to 2.6.12 since MCP51 support was merged in the 2.6.12-rc series. Gentoo would like to support this hardware for our upcoming release media, so I fixed the patch, and here it is :) Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 15:37:18 UTC |
| 13bbbf2 | Denis Vlasenko | 03 July 2005, 15:09:13 UTC | [PATCH] ide: fix line break in ide messages From: Denis Vlasenko <vda@ilport.com.ua> * printk("\n") is misplaced, resulting in stray empty line in kernel log * cleanups nerby: some back-to-back printks are combined, etc Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 15:09:13 UTC |
| f3718d3 | Herbert Xu | 03 July 2005, 14:42:18 UTC | [PATCH] ide: hotplug mark __devinit via82cxxx.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:42:18 UTC |
| d6904ab | Herbert Xu | 03 July 2005, 14:40:31 UTC | [PATCH] ide: hotplug mark __devinit triflex.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:40:31 UTC |
| 9731963 | Herbert Xu | 03 July 2005, 14:38:51 UTC | [PATCH] ide: hotplug mark __devinit slc90e66.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:38:51 UTC |
| 34a6224 | Herbert Xu | 03 July 2005, 14:36:56 UTC | [PATCH] ide: hotplug mark __devinit sl82c105.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:36:56 UTC |
| 6a6e1b1 | Herbert Xu | 03 July 2005, 14:35:07 UTC | [PATCH] ide: hotplug mark __devinit sc1200.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:35:07 UTC |
| 9307145 | Herbert Xu | 03 July 2005, 14:33:16 UTC | [PATCH] ide: hotplug mark __devinit opti621.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:33:16 UTC |
| c20530e | Herbert Xu | 03 July 2005, 14:31:04 UTC | [PATCH] ide: hotplug mark __devinit ns87415.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:31:04 UTC |
| a380a88 | Herbert Xu | 03 July 2005, 14:28:44 UTC | [PATCH] ide: hotplug mark __devinit it8172.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:28:44 UTC |
| ddbc9fb | Herbert Xu | 03 July 2005, 14:25:46 UTC | [PATCH] ide: hotplug mark __devinit cy82c693.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:25:46 UTC |
| 88de8e9 | Herbert Xu | 03 July 2005, 14:23:08 UTC | [PATCH] ide: hotplug mark __devinit cs5530.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:23:08 UTC |
| e895f92 | Herbert Xu | 03 July 2005, 14:15:41 UTC | [PATCH] ide: hotplug mark __devinit amd74xx.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:15:41 UTC |
| c2f1258 | Herbert Xu | 03 July 2005, 14:06:13 UTC | [PATCH] ide: hotplug mark __devinit alim15x3.c From: Herbert Xu <herbert@gondor.apana.org.au> mark the __init section __devinit. Splitted up from the Debian kernel patch. see the thread about the pci hotplug crash on a stratus box. http://marc.theaimsgroup.com/?l=linux-kernel&m=111930108613386&w=2 Signed-off-by: maximilian attems <janitor@sternwelten.at> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 03 July 2005, 14:06:13 UTC |
| 1d6bebf | Linus Torvalds | 02 July 2005, 17:39:09 UTC | Merge master.kernel.org:/home/rmk/linux-2.6-mmc | 02 July 2005, 17:39:09 UTC |
| 86166f9 | Linus Torvalds | 02 July 2005, 17:37:50 UTC | Merge master.kernel.org:/home/rmk/linux-2.6-arm | 02 July 2005, 17:37:50 UTC |
| 44f8e1a | Linus Torvalds | 02 July 2005, 17:35:33 UTC | If ACPI doesn't find an irq listed, don't accept 0 as a valid PCI irq. That zero just means that nothing else found any irq information either. | 02 July 2005, 17:35:33 UTC |
| 4a89a04 | Ivan Kokshaysky | 01 July 2005, 12:46:26 UTC | [PATCH] alpha smp fix (part #2) This fixes the bug that caused BUG_ON(!irqs_disabled()) to trigger in run_posix_cpu_timers() on alpha/smp. We didn't disable interrupts properly before calling smp_percpu_timer_interrupt(). We *do* disable interrupts everywhere except this unfortunate smp_percpu_timer_interrupt(). Fixed thus. Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 01 July 2005, 15:20:23 UTC |
| 3eee0d0 | Adrian Bunk | 01 July 2005, 12:07:37 UTC | [PATCH] MMC: wbsd cleanups This patch contains the following possible cleanups: - make some needlessly global code static - remove the unneeded global function DBG_REG Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 01 July 2005, 12:07:37 UTC |
| 6e6293d | Pierre Ossman | 01 July 2005, 11:13:55 UTC | [PATCH] MMC: wbsd delayed insertion Wait 0.5 seconds before scanning for cards after an insertion interrupt. The electrical connection needs this time to stabilise for some cards. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 01 July 2005, 11:13:55 UTC |
| db57955 | Nishanth Aravamudan | 01 July 2005, 11:11:51 UTC | [PATCH] ARM: replace schedule_timeout() with msleep() Use msleep() instead of schedule_timeout() to guarantee the task delays as expected. Neither signals nor wait-queue events are important at this point in the code, I believe. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 01 July 2005, 11:11:51 UTC |
| 7b09cda | Russell King | 01 July 2005, 11:02:59 UTC | [PATCH] MMC: Fix divdi3 reference in mmci.c Use do_div() instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 01 July 2005, 11:02:59 UTC |
| c77b042 | Russell King | 01 July 2005, 10:56:55 UTC | [PATCH] ARM: Make the magic values in head.S more obvious Make the magic address values in head.S more obvious as to where they came from. Wrap all debug code in CONFIG_DEBUG_LL. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 01 July 2005, 10:56:55 UTC |
| e695f60 | Ben Dooks | 01 July 2005, 10:27:06 UTC | [PATCH] ARM: 2783/1: Remove omnimeter_defconfig as there is no kernel support Patch from Ben Dooks The omnimeter_defconfig does not define any machines and seems to have no other support in the current kernel. This patch removes the config file, as this is the only thing currently mentioning the ominmeter. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 01 July 2005, 10:27:06 UTC |
| 3e18a45 | Todd Poynor | 01 July 2005, 10:27:06 UTC | [PATCH] ARM: 2782/1: PXA27x MDREFR K0DB4 define Patch from Todd Poynor Add definition of K0DB4 SDCLK<0,3> divide-by-4 control/status bit in the MDREFR register for Intel XScale PXA27x. Signed-off-by: Todd Poynor <tpoynor@mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 01 July 2005, 10:27:06 UTC |
| 26705ca | Todd Poynor | 01 July 2005, 10:27:05 UTC | [PATCH] ARM: 2781/2: PXA27x Standby mode take 2 Patch from Todd Poynor Add support for PXA27x Standby mode, a low-power mode that retains CPU and some peripheral state (the existing "sleep" mode is a power-power mode that retains less state). Activated via: echo -n standby > /sys/power/state From: David Burrage and Todd Poynor Signed-off-by: Todd Poynor <tpoynor@mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 01 July 2005, 10:27:05 UTC |
| ef6689e | Andrew Morton | 01 July 2005, 05:13:14 UTC | [PATCH] fatfs sectioning fix Fixup for the recent slab leak fix Cc: Pekka Enberg <penberg@cs.helsinki.fi> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 01 July 2005, 05:29:48 UTC |
| eaf05be | Ivan Kokshaysky | 30 June 2005, 16:02:18 UTC | [PATCH] alpha smp fix As usual, the reason of this breakage is quite silly: in do_entIF, we are checking for PS == 0 to see whether it was a kernel BUG() or userspace trap. It works, unless BUG() happens in interrupt - PS is not 0 in kernel mode due to non-zero IPL, and the things get messed up horribly then. In this particular case it was BUG_ON(!irqs_disabled()) triggered in run_posix_cpu_timers(), so we ended up shooting "current" with the bursts of one SIGTRAP and three SIGILLs on every timer tick. ;-) | 01 July 2005, 05:29:48 UTC |
| 62351cc | Linus Torvalds | 01 July 2005, 00:07:37 UTC | Merge master.kernel.org:/home/rmk/linux-2.6-arm | 01 July 2005, 00:07:37 UTC |
| d471cd4 | Linus Torvalds | 01 July 2005, 00:04:54 UTC | Merge master.kernel.org:/home/rmk/linux-2.6-serial | 01 July 2005, 00:04:54 UTC |
| 747aead | Catalin Marinas | 30 June 2005, 22:01:09 UTC | [PATCH] ARM: 2780/1: AFS partition length calculation fix Patch from Catalin Marinas This patch calculates the AFS partition length by expanding the image length information to the nearest erase block boundary. This eliminates the problems with JFFS2 erasing the footer. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 30 June 2005, 22:01:09 UTC |
| 44454bc | Russell King | 30 June 2005, 21:41:22 UTC | [PATCH] Serial: Fix small CONFIG_SERIAL_8250_NR_UARTS If CONFIG_SERIAL_8250_NR_UARTS is smaller than the array size in asm/serial.h, we trampled on memory which wasn't ours. Take our big boots away by limiting the number of ports initialised to the smaller of ...NR_UARTS and the array size. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 30 June 2005, 21:41:22 UTC |
| bd53d12 | Linus Torvalds | 30 June 2005, 16:04:36 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 | 30 June 2005, 16:04:36 UTC |
| abaf48a | Catalin Marinas | 30 June 2005, 16:04:14 UTC | [PATCH] ARM: 2779/1: Fix the V bit setting for the ARM1020x CPUs Patch from Catalin Marinas This patch fixes the V bit setting for the ARM1020x processors. At reset, this bit is automatically set to the value of the HIVECSINIT input signal which just happened to be 1 but it is not mandatory. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 30 June 2005, 16:04:14 UTC |
| c28a814 | Catalin Marinas | 30 June 2005, 16:04:14 UTC | [PATCH] ARM: 2778/1: Add -mno-thumb-interwork to CFLAGS_ABI Patch from Catalin Marinas The new EABI gcc adds -mthumb-interwork by default, even if -mabi=apcs-gnu is passed. This causes a warning for every compiled C file when -march=armv4 is used. The patch adds -mno-thumb-interwork if the option is supported. This is also useful since we don't need any ARM/Thumb interworking in the kernel Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 30 June 2005, 16:04:14 UTC |
| c19cb1d | Catalin Marinas | 30 June 2005, 16:04:13 UTC | [PATCH] ARM: 2777/1: Fix broken comment arch/arm/mm/proc-arm1020.S Patch from Catalin Marinas This patch fixes a broken comment in the proc-arm1020.S file which prevents the file compilation Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 30 June 2005, 16:04:13 UTC |
| 12829dc | Linus Torvalds | 30 June 2005, 15:48:56 UTC | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6 | 30 June 2005, 15:48:56 UTC |
| c60e81e | Andrew Morton | 30 June 2005, 09:59:06 UTC | [PATCH] reiserfs: handle_attrs() fix Fix a use-uninitialised bug. Cc: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:13 UTC |
| 8cb681b | Pekka Enberg | 30 June 2005, 09:59:05 UTC | [PATCH] freevxfs: minor cleanups This patch addresses the following minor issues: - Typo in printk - Redundant casts - Use C99 struct initializers instead of memset - Parenthesis around return value - Use inline instead of __inline__ Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:12 UTC |
| 1d2cc3b | Pekka Enberg | 30 June 2005, 09:59:05 UTC | [PATCH] freevxfs: remove 2.4 compatability This patch removes 2.4 compatability header from freevxfs. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:12 UTC |
| ba03bda | Pekka Enberg | 30 June 2005, 09:59:04 UTC | [PATCH] freevxfs: fix buffer_head leak - fix a buffer_head leak in vxfs_getfsh() - s/SLAB_KERNEL/GFP_KERNEL/ - check sb_bread() return value - drop pointless buffer-mapped() test. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:12 UTC |
| f220ab2 | Jay Lan | 30 June 2005, 09:59:03 UTC | [PATCH] Improper initrd failure message at boot time On system boot up, there was an failure reported to boot.msg: <5>Trying to move old root to /initrd ... failed According to initrd(4) man page, step #7 of BOOT-UP OPERATION is described as below: 7. If the normal root file has directory /initrd, device /dev/ram0 is moved from / to /initrd. Otherwise if directory /initrd does not exist device /dev/ram0 is unmounted. We got service calls from customers concerning about this failure message at boot time. Many systems do not have /initrd and thus the message can be changed in the case of non-existing /initrd so that it does not sound like a failure of the system. Signed-off-by: Jay Lan <jlan@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:12 UTC |
| 1c71e22 | Christoph Hellwig | 30 June 2005, 09:59:02 UTC | [PATCH] udf_find_entry() cleanup udf_find_entry can never be called with a NULL argument, so we shouldn't check for it. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:11 UTC |
| 532a39a | Pekka J Enberg | 30 June 2005, 09:59:01 UTC | [PATCH] fat: fix slab cache leak This patch plugs a slab cache leak in fat module initialization. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:11 UTC |
| 9ec55a9 | Chris Zankel | 30 June 2005, 09:59:00 UTC | [PATCH] xtensa: Fix asm macro Removed dead code in arch/xtensa/kernel/pci.c and use the pci_name() macro. Fixed an error in the delay asm macro: '1' is an invalid immediate value. Signed-off-by: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:11 UTC |
| e7d163f | Chris Zankel | 30 June 2005, 09:58:59 UTC | [PATCH] xtensa: Removed local copy of zlib and fixed O= support Removed an unnecessary local copy of zlib (sorry for the add'l traffic). Fixed 'O=' support (thanks to Jan Dittmer for pointing it out). Some minor clean-ups in the make files. Signed-off-by: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:11 UTC |
| 82300bf | Chris Zankel | 30 June 2005, 09:58:58 UTC | [PATCH] xtensa: Added mm/Kconfig to get a flat memory layout Added 'mm/Kconfig' to the xtensa Kconfig file to get a flat memory layout. Fixed a typo in one of the help texts (thanks Geert for pointing it out) Signed-off-by: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:10 UTC |
| 5b0de92 | Chris Zankel | 30 June 2005, 09:58:57 UTC | [PATCH] xtensa: cleanups for errno and ipc. I noticed this because I was doing some more ipc cleanups and I did the original errno and ipc cleanups for other architectures, so it stuck out. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:10 UTC |
| 0ee23b5 | Jesper Juhl | 30 June 2005, 09:58:56 UTC | [PATCH] xtensa: use valid_signal() xtensa should use valid_signal() instead of testing _NSIG directly like everyone else. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:10 UTC |
| 306e440 | Ingo Molnar | 30 June 2005, 09:58:55 UTC | [PATCH] x86: i8253/i8259A lock cleanup Introduce proper declarations for i8253_lock and i8259A_lock. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:10 UTC |
| bcbda35 | Kumar Gala | 30 June 2005, 09:58:55 UTC | [PATCH] ppc32: Fix pointer check for MPC8540 ADS device Editor snafu in which the call to ppc_sys_get_pdata got inside the if check instead of before it. Oops. Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:09 UTC |
| 6931dfc | Eric Paris | 30 June 2005, 09:58:51 UTC | [PATCH] selinux_sb_copy_data() should not require a whole page Currently selinux_sb_copy_data requires an entire page be allocated to *orig when the function is called. This "requirement" is based on the fact that we call copy_page(in_save, nosec_save) and in_save = orig when the data is not FS_BINARY_MOUNTDATA. This means that if a caller were to call do_kern_mount with only about 10 bytes of options, they would get passed here and then we would corrupt PAGE_SIZE - 10 bytes of memory (with all zeros.) Currently it appears all in kernel FS's use one page of data so this has not been a problem. An out of kernel FS did just what is described above and it would almost always panic shortly after they tried to mount. From looking else where in the kernel it is obvious that this string of data must always be null terminated. (See example in do_mount where it always zeros the last byte.) Thus I suggest we use strcpy in place of copy_page. In this way we make sure the amount we copy is always less than or equal to the amount we received and since do_mount is zeroing the last byte this should be safe for all. Signed-off-by: Eric Paris <eparis@parisplace.org> Cc: Stephen Smalley <sds@epoch.ncsc.mil> Acked-by: James Morris <jmorris@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:09 UTC |
| 9a936eb | Kylene Jo Hall | 30 June 2005, 09:58:50 UTC | [PATCH] tpm: fix bug introduced by the /proc/misc In fixing the /proc/misc problem that was reported last week where the tpm module name was being obfuscated in /proc/misc I introduced a bug in the module unloading code. This patch fixes the problem. Signed-off-by: Kylene Hall <kjhall@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:09 UTC |
| ee93b43 | Olaf Hering | 30 June 2005, 09:58:49 UTC | [PATCH] ppc32: use correct register names in arch/ppc/kernel/relocate_kernel.S CONFIG_KEXEC=y doesnt work: arch/ppc/kernel/relocate_kernel.S:37: Error: unsupported relocation against SRR1 arch/ppc/kernel/relocate_kernel.S:39: Error: unsupported relocation against SRR0 Signed-off-by: Olaf Hering <olh@suse.de> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:09 UTC |
| 5ee24d9 | Heiko Carstens | 30 June 2005, 09:58:48 UTC | [PATCH] s390: fix finish_arch_switch Commit 4866cde064afbb6c2a488c265e696879de616daa requires finish_arch_switch to have only one parameter instead of two. Also fix another compile error (double declaration of account_system_vtime) if CONFIG_VIRT_CPU_ACCOUNTING is not defined. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:08 UTC |
| eb05bfe | Dominik Brodowski | 30 June 2005, 09:58:47 UTC | [PATCH] pcmcia: update Documentation As the information is now exported via sysfs, there's no need for an userspace tool any longer. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:08 UTC |
| 3704511 | Dominik Brodowski | 30 June 2005, 09:58:47 UTC | [PATCH] pcmcia: fix modalias attribute in sysfs Fix up PCMCIA modalias file in sysfs Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 30 June 2005, 15:45:08 UTC |
| 41359dc | Russell King | 30 June 2005, 15:30:07 UTC | [PATCH] ARM: Acornfb: Don't claim IRQ fbcon for cursor The generic fbcon code tries to register and use the vsync IRQ for ARM platforms with acornfb, but forgets to disable its own cursor timer. The result is a flickering flashing cursor. Remove the code from the fbcon core to register this platform private interrupt. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 30 June 2005, 15:30:07 UTC |
| cfb0810 | Russell King | 30 June 2005, 10:06:49 UTC | [PATCH] ARM: Don't try to send a signal to pid0 If we receive an unrecognised abort during boot, don't try to send a signal to pid0, but instead report the current state. This leads to less confusing debug reports. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 30 June 2005, 10:06:49 UTC |
