summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.gitSteve French2006-01-171248-34362/+58179
|\ | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-01-1737-565/+543
| |\
| | * [NET]: Use is_zero_ether_addr() in net/core/netpoll.cKris Katterjohn2006-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | This replaces a memcmp() with is_zero_ether_addr(). Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [CASSINI]: Fix printk warning.Andrew Morton2006-01-171-2/+2
| | | | | | | | | | | | | | | | | | | | | drivers/net/cassini.c:1930: warning: long unsigned int format, different type arg (arg 4) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [PKTGEN]: Replacing with (compare|is_zero)_ether_addr() and ETH_ALENKris Katterjohn2006-01-171-23/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces some tests with is_zero_ether_addr(), memcmp(one, two, 6) with compare_ether_addr(one, two), and 6 with ETH_ALEN where appropriate. Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [NET]: "signed long" -> "long"Kris Katterjohn2006-01-173-8/+8
| | | | | | | | | | | | | | | Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [EBTABLES]: Handle SCTP/DCCP in ebt_{ip,log}Patrick McHardy2006-01-172-2/+6
| | | | | | | | | | | | | | | Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [PKT_SCHED]: Handle SCTP/DCCP in sfq_hashPatrick McHardy2006-01-171-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [IPV4]: rt_cache_stat can be statically definedEric Dumazet2006-01-171-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using __get_cpu_var(obj) is slightly faster than per_cpu_ptr(obj, raw_smp_processor_id()). 1) Smaller code and memory use For static and small objects, DEFINE_PER_CPU(type, object) is preferred over a alloc_percpu() : Better and smaller code to access them, and no extra memory (storing the pointer, and the percpu array of pointers) x86_64 code before patch mov 1237577(%rip),%rax # ffffffff803e5990 <rt_cache_stat> not %rax # part of per_cpu machinery mov %gs:0x3c,%edx # get cpu number movslq %edx,%rdx # extend 32 bits cpu number to 64 bits mov (%rax,%rdx,8),%rax # get the pointer for this cpu incl 0x38(%rax) x86_64 code after patch mov $per_cpu__rt_cache_stat,%rdx mov %gs:0x48,%rax # get percpu data offset incl 0x38(%rax,%rdx,1) 2) False sharing avoidance for SMP : For a small NR_CPUS, the array of per cpu pointers allocated in alloc_percpu() can be <= 32 bytes. This let slab code gives a part of a cache line. If the other part of this 64 bytes (or 128 bytes) cache line is used by a mostly written object, we can have false sharing and expensive per_cpu_ptr() operations. Size of rt_cache_stat is 64 bytes, so this patch is not a danger of a too big increase of bss (in UP mode) or static per_cpu data for SMP (PERCPU_ENOUGH_ROOM is currently 32768 bytes) Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [NET]: Make second arg to skb_reserved() signed.David S. Miller2006-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some subsystems, such as PPP, can send negative values here. It just happened to work correctly on 32-bit with an unsigned value, but on 64-bit this explodes. Figured out by Paul Mackerras based upon several PPP crash reports. Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [NETFILTER]: ip_conntrack_proto_gre.c needs linux/interrupt.hDavid S. Miller2006-01-171-0/+1
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [TG3]: Refine nvram lockingMichael Chan2006-01-172-28/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add nvram lock count so that calls to tg3_nvram_lock()/unlock() can be nested. Add error checking to all callers of tg3_nvram_lock() where appropriate. To prevent nvram lock failures after halting the firmware, it is also necessary to release firmware's nvram lock in tg3_halt_cpu(). Update version to 3.48. Based on David Miller's initial patch. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [NETFILTER] ip6tables: whitespace and indent cosmetic cleanupYasuyuki Kozakai2006-01-177-422/+427
| | | | | | | | | | | | | | | | | | Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [NETFILTER] ip6tables: remove unused definitionsYasuyuki Kozakai2006-01-175-45/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | These definitions ware used for only internal use in kernel <= 2.6.13, which had not introduced the unified parser of IPv6 extension header yet. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [NETFILTER] Makefile cleanupYasuyuki Kozakai2006-01-172-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | These are replaced with x_tables matches and no longer exist. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [NETFILTER] ip[6]t_policy: Fix compilation warningsBenoit Boissinot2006-01-172-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | ip[6]t_policy argument conversion slipped when merging with x_tables Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [NET]: Fix whitespace issues in net/core/filter.cKris Katterjohn2006-01-171-7/+6
| | | | | | | | | | | | | | | | | | | | | This fixes some whitespace issues in net/core/filter.c Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [PKT_SCHED] sch_prio: fix qdisc bands initAmnon Aaronsohn2006-01-171-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when PRIO is configured to use N bands, it lets the packets be directed to any of the bands 0..N-1. However, PRIO attaches a fifo qdisc only to the bands that appear in the priomap; the rest of the N bands remain with a noop qdisc attached. This patch changes PRIO's behavior so that it attaches a fifo qdisc to all of the N bands. Signed-off-by: Amnon Aaronsohn <bla@cs.huji.ac.il> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [IPV6]: Preserve procfs IPV6 address output formatYOSHIFUJI Hideaki2006-01-175-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | Procfs always output IPV6 addresses without the colon characters, and we cannot change that. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-01-175-26/+23
| |\ \
| | * | [SOUND]: sparc/cs4231: Fix some typos which wrecked the build.David S. Miller2006-01-171-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: Fix sbusfb build.David S. Miller2006-01-172-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbusfb_compat_ioctl() needs to return int, not long, as that is what the fb_ops->fb_compat_ioctl method prototype wants. Need to git rid of the "struct file *file" first argument to fbiogetputcmap() and fbiogscursor() to match calls done in sbusfb_compat_ioctl(). Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: change if() BUG(); to BUG_ON in iommu.cEric Sesterhenn2006-01-171-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this patch changes if() BUG(); constructs in iommu.c to BUG_ON(); so it gets save to define BUG() and BUG_ON() to nullstatements. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC64]: Eliminate race condition reading Hummingbird STICK registerRichard Mortimer2006-01-171-11/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure a consistent value is read from the STICK register by ensuring that both high and low are read without high changing due to a roll over of the low register. Various Debian/SPARC users (myself include) have noticed problems with Hummingbird based systems. The symptoms are that the system time is seen to jump forward 3 days, 6 hours, 11 minutes give or take a few seconds. In many cases the system then hangs some time afterwards. I've spotted a race condition in the code to read the STICK register. I could not work out why 3d, 6h, 11m is important but guess that it is due to the 2^32 jump of STICK (forwards on one read and then the next read will seem to be backwards) during a timer interrupt. I'm guessing that a change of -2^32 will get converted to a large unsigned increment after the arithmetic manipulation between STICK, nanoseconds, jiffies etc. I did a test where I modified __hbird_read_stick to artificially inject rollover faults forcefully every few seconds. With this I saw the clock jump over 6 times in 12 hours compared to once every month or so. Signed-off-by: Richard Mortimer <richm@oldelvet.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [PATCH] Fix sparse parse error in lppaca.hBryan O'Sullivan2006-01-171-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sparse can't parse a struct definition in include/asm-powerpc/lppaca.h, even though gcc can accept it. The form looks like this: struct __attribute__((whatever)) foo { }; An equivalent that both gcc and sparse can handle is struct foo { } __attribute__((whatever)); This is the only definition of this type in the tree, and fixing it is easier than fixing sparse. Signed-off-by: Bryan O'Sullivan <bos@serpentine.com> [ Side note: fixing sparse wouldn't be hard, but the "attribute at the end" version is the canonical one, and the one that makes sense. So let's just fix the kernel instead. Luc Van Oostenryck already sent out a sparse patch to the sparse mailing list in case anybody cares. -- Linus ] Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Linux v2.6.16-rc1v2.6.16-rc1Linus Torvalds2006-01-161-2/+2
| |
| * Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-blockLinus Torvalds2006-01-162-2/+273
| |\
| | * [BLOCK] elevator: if specified scheduler is not found, fall back to defaultJens Axboe2006-01-161-2/+2
| | | | | | | | | | | | Signed-off-by: Jens Axboe <axboe@suse.de>
| | * [BLOCK] elevator: Make elevator=as work again for anticipatoryChuck Ebbert2006-01-161-0/+7
| | | | | | | | | | | | | | | Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Jens Axboe <axboe@suse.de>
| | * barrier.txt got lost while the new barrier patchset was climbing upTejun Heo2006-01-161-0/+271
| | | | | | | | | | | | | | | | | | | | | the ladder to the mainline. Add it back. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jens Axboe <axboe@suse.de>
| * | [PATCH] Remove unused code from rioctrl.c (Last for this batch of work)Alan Cox2006-01-161-110/+1
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove rio_table.c unused codeAlan Cox2006-01-161-8/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove unused code from rio_linux.cAlan Cox2006-01-161-60/+0
| | | | | | | | | | | | Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove unused CHECK code from riocmd.cAlan Cox2006-01-161-30/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove unused code from rioroute.hAlan Cox2006-01-161-24/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove unused code from rioboot.hAlan Cox2006-01-161-61/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove unused code from riobootAlan Cox2006-01-161-1152/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove #if 0 and other long dead code from rio_ttyAlan Cox2006-01-161-583/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove long dead #if 0 code from rio_paramAlan Cox2006-01-161-43/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove old firmware headers from rio driversAlan Cox2006-01-164-235/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove rtahw.h from rio driver (unused file)Alan Cox2006-01-161-75/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove file riscos.h from rio driver (unused file)Alan Cox2006-01-161-63/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove file riowinif.h from rio driver (unused file)Alan Cox2006-01-161-1329/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove riotime.h from rio driver (unused file)Alan Cox2006-01-161-63/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove file riolocks.h from rio driver (unused file)Alan Cox2006-01-161-43/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove proto.h from rio driver (unused file)Alan Cox2006-01-161-244/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove poll.h from rio driver (unused file)Alan Cox2006-01-161-73/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove mesg.h from rio driver (unused file)Alan Cox2006-01-161-41/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove mca.h from rio driver (unused file)Alan Cox2006-01-161-73/+0
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Remove internal firmware building files from rioAlan Cox2006-01-163-154/+0
| | | | | | | | | | | | Signed-off-by: Linus Torvalds <torvalds@osdl.org>
OpenPOWER on IntegriCloud