Home Home > GIT Browse
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2004-06-06Linux 2.6.7-rc3v2.6.7-rc3Linus Torvalds
2004-06-07input: Exclude tasklet changes to i8042.cVojtech Pavlik
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
2004-06-07Merge suse.cz:/home/vojtech/bk/linusVojtech Pavlik
into suse.cz:/home/vojtech/bk/for-linus
2004-06-06Merge bk://kernel.bkbits.net/davem/sparc-2.6Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-06-06Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6David S. Miller
into kernel.bkbits.net:/home/davem/net-2.6
2004-06-06[NETFILTER]: Small cleanup for {ipt,ip6t,arpt}_find_targetJamal Hadi Salim
Signed-off-by: Jamal Hadi Salim <hadi@zynx.com> Signed-off-by: David S. Miller <davem@redhat.com>
2004-06-06[FB]: Fix uninitialized fb_cmap member in sbuslib.cAdam Kropelin
When handling FBIOPUTCMAP_SPARC, sbusfb fails to initialize cmap.transp, which quickly leads to an oops when fb_set_cmap() dereferences it. First encountered in Aurora Wombat kernels and seems to afflict mainline as well. Patch is against 2.6.7-rc2. xorg still fails to actually get anything to display on my CG6, but at least it no longer oopses the kernel. Signed-off-by: Adam Kropelin <akropel1@rochester.rr.com> Signed-off-by: David S. Miller <davem@redhat.com>
2004-06-06Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6David S. Miller
into kernel.bkbits.net:/home/davem/net-2.6
2004-06-06[TCP]: Need tcp_get_info decl in net/tcp.hDavid S. Miller
2004-06-06Merge bk://bk.arm.linux.org.uk/linux-2.6-rmkLinus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-06-06[ARM] Update mach-types.Russell King
2004-06-06[ARM] Uninline flush_dcache_page()Russell King
2004-06-06[PATCH] Fix missing padding in DMI table.Dave Jones
This entry in the DMI blacklist table is missing it's NO_MATCH tags, which means the struct gets padded instead of filled with the desired NO_MATCH data which is {255, NULL} Usually not fatal it seems, but there have been numerous cases in Red Hat bugzilla where this did get tripped up, and caused an immediate reset on these boards. Not fun to track down. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-06[PATCH] fix warning in synclink.cDave Jones
Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-06[PATCH] ppc64: make the TLB flush logic match ppc32Benjamin Herrenschmidt
Adds a dummy flush_tlb_page_nohash() called by ptep_set_access_bits(), to be used if we ever have a ppc64 CPU with software loaded TLB. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-06[PATCH] ppc32: missed flush_tlb_page_nohash() casesBenjamin Herrenschmidt
ARGH. Missed one file. Here is an additional patch (missed tlbflush.h patch) Sorry. This adds the definiction of flush_tlb_page_nohash() that was missing from the previous patch fixing SW-TLB loaded PPCs Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-06[PATCH] ppc32: Fix CPUs with soft loaded TLBBenjamin Herrenschmidt
The recent introduction of ptep_set_access_flags() with the optimisation of not flushing the TLB unfortunately broke ppc32 CPUs with no hash table. The data access exception code path in assembly for these doesn't properly deal with the case where the TLB entry is present with the wrong PAGE_RW and will just call do_page_fault again instead of just replacing the TLB entry. Fixing the asm code for all the different CPU types affected (yah, embedded PPCs all have different MMUs =P) is painful and need testing I can't do at the moment, so here's a fix that will just flush the TLB page when changing the access flags on non-hash based machines. Please apply. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org
2004-06-05rpc: Use proper printk format for size_t argument.Linus Torvalds
2004-06-05[PATCH] sched: honor the "sync" wakeup bitIngo Molnar
The scheduler changes had another thing missing: the appreciation of sync wakeups. (I had this in one of the earlier sched-domains cleanup patches before but it got lost in the shuffle.) When a sync waker is waking, we should subtract its load from the current load - it will schedule away for sure in the near future. That's what the "sync" bit means. This change is necessary because with the sched-domains balancer we have a much more sensitive cpu-load estimator, and in this particular context of try_to_wake_up() the sync waker's effect will always be part of the load. Patch against your patch attached. In my testing there's an additional increase in bw_pipe numbers on a dual P2 box, it went from 110-120 MB/sec to 120-130 MB/sec. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-05Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdogLinus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-06-07[WATCHDOG] linux/watchdog.h include types.h patchChristoph Hellwig
watchdog.h is using __u8 and __u32 from linux/types.h, so it needs to include it.
2004-06-05Merge nuts.davemloft.net:/disk1/BK/network-2.6David S. Miller
into nuts.davemloft.net:/disk1/BK/net-2.6
2004-06-05[NET]: Fix compat bug in recvmsg/sendmsg wrt MSG_CMSG_COMPAT.Olaf Hering
2004-06-05[NET]: Add ARPHRD_NONE and use it in tun driver.Jamal Hadi Salim
2004-06-04[PATCH] kill drivers/ide TCQ supportJens Axboe
Lets just remove it. It's been disabled some time ago, and there's no chance of it ever getting resurrected. PATA TCQ has so many technical short comings, that it was never really interesting I'm afraid. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] ide: remove dead code from ide-taskfile.cBartlomiej Zolnierkiewicz
Remove dead code from task_in_intr() and pre_task_mulout_intr() (CONFIG_IDE_TASKFILE_IO=n versions). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] ide: sanitize __ide_do_rw_disk() debugging codeBartlomiej Zolnierkiewicz
- move common code to ide_do_rw_disk() (+ always print block number and rq->buffer) - use pr_debug() Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] ide: remove needless exportsBartlomiej Zolnierkiewicz
Remove needless exports from ide.c, ide-probe.c and ide-proc.c. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] ide: use try_to_flush_leftover_data() in idedisk_error()Bartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] ide: remove unused ide_remove_setting() from ide.cBartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] ide: change CONFIG_IDEDISK_STOKE to a runtime optionBartlomiej Zolnierkiewicz
From: Christoph Hellwig <hch@lst.de> To be useful for distribution kernels it needs to be a runtime option. The original patch is from Joerg Platte via the Debian kernel package, with some adjustments from me (and me too - Bart). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04Merge bk://kernel.bkbits.net/davem/sparc-2.6Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-06-04Merge http://lia64.bkbits.net/to-linus-2.5Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-06-04Merge bk://drm.bkbits.net/drm-2.6Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2004-06-04[PATCH] Fix ipmi compile failureCorey Minyard
Geert Uytterhoeven wrote: While compiling drivers/char/ipmi/ipmi_si_intf.c in 2.6.6-rc1 on m68k, I noticed a missing include (needed for disable_irq_nosync() and enable_irq()): Furthermore none of CONFIG_ACPI_INTERPETER, CONFIG_X86, and CONFIG_PCI were set, and thus IPMI_MEM_ADDR_SPACE and IPMI_IO_ADDR_SPACE are not defined, but they are used. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] MTD: add st m50fw0* to jedec_probe.cDave Airlie
Adds support to the jedec probe for ST M50FW040, M50FW080 and M50FW016 all Firmware hubs for i8x0 chipsets, http://www.st.com/stonline/products/families/memories/fl_nor/fl_fwh.htm Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] Fix procfs warnings when removing ipmi_si moduleCorey Minyard
Presently we get procfs warnings from ipmi_si.ko due to its failing to remove all of a /proc directory's contents prior to removing that directory. This patch tracks all proc entries for an IPMI interface and unregisters them all upon removal. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] Fix DRM mismerge(?)Benjamin Herrenschmidt
From: Colin Leroy <colin@colino.net> Paulus brought this up on IRC, it seems to be a bad DRM merge: The code #ifndef VMAP_4_ARGS if ( dev->agp->cant_use_aperture ) return -EINVAL; #endif in DRM(agp_acquire) should be removed altogether in a 2.6 kernel because its vmap() takes 4 arguments; however, only the guards seem to have been removed, which causes this function to erroneously fail if the AGP aperture can't be directly accessed by the CPU. Signed-off-by: Colin Leroy <colin@colino.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] Fix rivafb's OpenFirmware parsingBenjamin Herrenschmidt
The attached patch fixes the EDID parsing for PPC on rivafb. It actually finds the EDID info in the OF Tree now. I grabbed this from BenHs Tree as of 2.6.5-rc3. The current code has no chance to work since it doesn't walk the device tree. This helps rivafb on PPC at least a bit further... Signed-off-by: Guido Guenther <agx@sigxcpu.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] sched: improve wakeup-affinityNick Piggin
David Mosberger noticed bw_pipe was way down on sched-domains kernels on SMP systems. That is due to two things: first, the previous wake-affine logic would *always* move a pipe wakee onto the waker's CPU. With the scheduler rework, this was toned down a lot (but extended to all types of wakeups). One of the ways this was damped was with the logic: don't move the wakee if its CPU is relatively idle compared to the waker's CPU. Without this, some workloads would pile everything up onto a few CPUs and get lots of idle time. However, the fix was a bit of a blunt hack: if the wakee runqueue was below 50% busy, and the waker's was above 50% busy, we wouldn't do the move. I think a better way to capture it is what this patch does: if the wakee runqueue is below 100% busy, and the sum of the two runqueue's loads is above 100% busy, and the wakee runqueue is less busy than the waker runqueue (ie. CPU utilisation would drop if we do the move), then we don't do the move. After I fixed this, I found things were still getting bounced around quite a bit. The reason is that we were attempting very aggressive idle balancing in order to cut down idle time in a dbt2-pgsql workload, which is particularly sensitive to idle. After having Mark Wong (markw@osdl.org) retest this load with this patch, it looks like we don't need to be so aggressive. I'm glad to be rid of this because it never sat too well with me. We should see slightly lower cost of schedule and slightly improved cache impact with this change too. Mark said: --- This looks pretty good: metric kernel 2334 2.6.7-rc2 2298 2.6.7-rc2-mm2 2329 2.6.7-rc2-mm2-sched-more-wakeaffine --- ie. within the noise. David said: --- Oooh, me likeee! Host OS Pipe AF UNIX --------- ------------- ---- ---- caldera.h Linux 2.6.6 3424 2057 (plain 2.6.6) caldera.h Linux 2.6.7-r 333. 1402 (original 2.6.7-rc1) caldera.h Linux 2.6.7-r 3086 4301 (2.6.7-rc1 with your patch) Pipe-bandwidth is still down about 10% but that may be due to unrelated changes (or perhaps warmup effects?). The AF UNIX bandwidth is just mindboggling. Moreover, with your patch 2.6.7-rc1 shows better context-switch times and lower communication latencies (more like the numbers you're getting on UP). So it seems like the overall balance of keeping things on the same CPU vs. distributing them across CPUs is improved. --- I also ran some tests on the NUMAQ. kernbench, dbench, hackbench, reaim were much the same. tbench was improved, very much so when clients < NR_CPU. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] md: fix BUG in raid5 resync code.Neil Brown
This condtion on this loop is primarily to avoid the loop if it doesn't appear to be needed. However it optimises a little too much and there is a case where it skips the loop when it is really needed. This patch fixes it. Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] fix cdrom length checkJens Axboe
There's a bad length check in cdrom_get_random_writable(), it's off-by-4 since fh->data_len is the length of data _after_ that field (which is offset 4 bytes in the header). Check is pretty bogus anyways, so just kill it. Signed-Off-By: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] synclink.c driver init modificationsPaul Fulghum
* Fix cleanup on driver init failure (call pci_unregister_driver if necessary) * Keep driver loaded if no hardware found (for dynid support) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] synclink_cs.c driver init modificationsPaul Fulghum
* Fix cleanup on driver init failure Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] synclinkmp.c driver init modificationsPaul Fulghum
* Fix cleanup on driver init failure (call pci_unregister_driver if necessary) * Keep driver loaded if no hardware found (for dynid support) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] dm: dm-ioctl.c: change an int* to a size_t*Kevin Corry
dm-ioctl.c: Use a size_t* instead of an int* in list_version_get_needed(). size_t and int are not the same size on all architectures. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] nfs-direct warning fixAndrew Morton
fs/nfs/direct.c: In function `nfs_file_direct_write': fs/nfs/direct.c:549: warning: initialization discards qualifiers from pointer target type Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] fix sysfs node cpumap for large NR_CPUSRusty Russell
As pointed out by Paul Jackson <pj@sgi.com>, sometimes 99 chars is not enough. We currently get a page from sysfs: that code should check we haven't overrun it. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Paul Jackson <pj@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] Use KERN_ALERT more for oopsesAndi Kleen
Often users only report what syslogd reports with KERN_ALERT when a kernel crash occurs. Make an oops print mpre information with that (in particular the RIP) Patch for i386 and x86-64. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2004-06-04[PATCH] md: support reshaping raid1 arrays - adding or removing drives.Neil Brown
This allows the number of "raid_disks" in a raid1 to be changed. This requires allocating a new pool of "r1bio" structures which a different number of bios, suspending IO, and swapping the new pool in place of the old. (and a few other related changes). Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>