summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] ufs: fix oops with `ufs1' typeEvgeniy Dushistov2006-02-033-7/+8
| | | | | | | | | | | | | | | "rm" command, on file system with "ufs1" type cause system hang up. This is, in fact, not so bad as it seems to be, because of after that in "kernel control path" there are 3-4 places which may cause "oops". So the first patch fix oopses, and the second patch fix "kernel hang up". "oops" appears because of reading of group's summary info partly wrong, and access to not first group's summary info cause "oops". Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] sx.c printk warning fixesAndrew Morton2006-02-031-3/+3
| | | | | | | | | | drivers/char/sx.c: In function `sx_set_real_termios': drivers/char/sx.c:934: warning: long unsigned int format, different type arg (arg 2) drivers/char/sx.c:961: warning: long unsigned int format, different type arg (arg 2) drivers/char/sx.c:976: warning: long unsigned int format, different type arg (arg 2) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] quota_v2: printk warning fixesAndrew Morton2006-02-031-1/+1
| | | | | | | | | | fs/quota_v2.c: In function `v2_check_quota_file': fs/quota_v2.c:39: warning: int format, different type arg (arg 2) fs/quota_v2.c:39: warning: int format, different type arg (arg 3) Cc: Jan Kara <jack@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] parport_serial: printk warning fixAndrew Morton2006-02-031-2/+2
| | | | | | | | drivers/parport/parport_serial.c: In function `parport_register': drivers/parport/parport_serial.c:334: warning: unsigned int format, different type arg (arg 3) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] someone broke reiserfs V3 mount options, this fixes itVitaly Fertman2006-02-031-1/+1
| | | | | | | | Signed-off-by: Hans Reiser <reiser@namesys.com> Signed-off-by: Vitaly Fertman <vitaly@namesys.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] don't allow users to set CONFIG_BROKEN=yAdrian Bunk2006-02-031-11/+0
| | | | | | | | | | | | | Do not allow people to create configurations with CONFIG_BROKEN=y. The sole reason for CONFIG_BROKEN=y would be if you are working on fixing a broken driver, but in this case editing the Kconfig file is trivial. Never ever should a user enable CONFIG_BROKEN. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] parport: fix printk format warningRandy Dunlap2006-02-031-2/+2
| | | | | | | | | | Fix printk format warning: drivers/parport/probe.c:205: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] SBC EPX does not check/claim I/O ports it uses (2nd Edition)Alan Cox2006-02-031-2/+11
| | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] sx.c warning fixesAndrew Morton2006-02-031-3/+3
| | | | | | | | | | drivers/char/sx.c: In function `sx_set_real_termios': drivers/char/sx.c:934: warning: int format, long unsigned int arg (arg 2) drivers/char/sx.c:961: warning: unsigned int format, tcflag_t arg (arg 2) drivers/char/sx.c:976: warning: unsigned int format, tcflag_t arg (arg 2) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] 3c59x: collision statistic fixSteffen Klassert2006-02-031-10/+23
| | | | | | | | | Count the total number of packets with collisions during transmission in vp->stats.collisions. Signed-off-by: Steffen Klassert <klassert@mathematik.tu-chemnitz.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] list.h: don't evaluate macro args multiple timesZach Brown2006-02-031-4/+10
| | | | | | | | | | | | | | | | | | | I noticed that list.h init functions were evaluating macro arguments multiple times and thought it might be nice to protect the unsuspecting caller. Converting the macros to inline functions seems to reduce code size, too. A i386 defconfig build with gcc 3.3.3 from fc4: text data bss dec hex filename 3573148 565664 188828 4327640 4208d8 vmlinux.before 3572177 565664 188828 4326669 42050d vmlinux add/remove: 0/0 grow/shrink: 11/144 up/down: 88/-1016 (-928) There was no difference in checkstack output. Signed-off-by: Zach Brown <zach.brown@oracle.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] include/asm-*/bitops.h: fix more "~0UL >> size" typosAlexey Dobriyan2006-02-034-4/+4
| | | | | | | | | | | | | | | "[PATCH] m68knommu: fix find_next_zero_bit in bitops.h" fixed a typo in m68knommu implementation of find_next_zero_bit(). grep(1) shows that cris, frv, h8300, v850 are also affected. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Mikael Starvik <starvik@axis.com> Cc: David Howells <dhowells@redhat.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Tell kallsyms_lookup_name() to ignore type U entriesKeith Owens2006-02-031-1/+2
| | | | | | | | | | | | | | | | | | | | When one module exports a function symbol and another module uses that symbol then kallsyms shows the symbol twice. Once from the consumer with a type of 'U' and once from the provider with a type of 't' or 'T'. On most architectures, both entries have the same address so it does not matter which one is returned by kallsyms_lookup_name(). But on architectures with function descriptors, the 'U' entry points to the descriptor, not to the code body, which is not what we want. IA64 # grep -w qla2x00_remove_one /proc/kallsyms a000000208c25ef8 U qla2x00_remove_one [qla2300] <= descriptor a000000208bf44c0 t qla2x00_remove_one [qla2xxx] <= function body Tell kallsyms_lookup_name() to ignore type U entries in modules. Signed-off-by: Keith Owens <kaos@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: fix to_channelpath macroCornelia Huck2006-02-031-1/+1
| | | | | | | | | Fix broken to_channelpath macro (fortunately worked in all current cases...). Signed-off-by: Cornelia Huck <cohuck@de.ibm.com> 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>
* [PATCH] s390: fix compat syscall wrapperHeiko Carstens2006-02-031-3/+3
| | | | | | | | | | Patch 9ad11ab48b1ad618bf47076e9e579f267f5306c2 changes the type of the first argument of some compat syscalls from int to unsigned int. Add these changes to the s390 compat wrapper as well. 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>
* [PATCH] s390: compile fix: missing defines in asm-s390/io.hHeiko Carstens2006-02-031-0/+6
| | | | | | | | | | | Compile fix: add missing __raw_read* and __raw_write* defines to include/asm-s390/io.h. These are mandatory since patch c27a0d75b33c030965cc97d3d7f571107a673fb4 was merged. 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>
* [PATCH] s390: timer interface visibilityJan Glauber2006-02-031-2/+6
| | | | | | | | | Avoid visibility of kernel internal interface to user space. Signed-off-by: Jan Glauber <jan.glauber@de.ibm.com> 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>
* [PATCH] s390: dasd extended error reporting moduleStefan Weinhuber2006-02-038-5/+1231
| | | | | | | | | | | | The DASD extended error reporting is a facility that allows to get detailed information about certain problems in the DASD I/O. This information can be used to implement fail-over applications that can recover these problems. Signed-off-by: Stefan Weinhuber <wein@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> 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>
* [PATCH] ide: restore support for AEC6280M cards in aec62xx.cThibaut VARENE2006-02-031-0/+15
| | | | | | | | | | | | | | This patch adds missing initialization sequence, necessary to get the "Macintosh" version of AEC6280 cards to work in Linux. Without this patch, the driver hangs for several minutes trying to initialize the card and the kernel is left in an unstable state. This patch has been tested fine on ppc and i386. Signed-off-by: Thibaut VARENE <varenet@parisc-linux.org> Acked-by: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix compilation errors in maps/dc21285.cMartin Michlmayr2006-02-031-3/+6
| | | | | | | | | | | | | | | CC drivers/mtd/maps/dc21285.o drivers/mtd/maps/dc21285.c: In function `dc21285_copy_to_32': drivers/mtd/maps/dc21285.c:113: error: invalid lvalue in increment drivers/mtd/maps/dc21285.c: In function `dc21285_copy_to_16': drivers/mtd/maps/dc21285.c:124: error: invalid lvalue in increment drivers/mtd/maps/dc21285.c: In function `dc21285_copy_to_8': drivers/mtd/maps/dc21285.c:134: error: invalid lvalue in increment make[3]: *** [drivers/mtd/maps/dc21285.o] Error 1 Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] fix generic_fls64()Akinobu Mita2006-02-031-1/+1
| | | | | | | | | | Noticed by Rune Torgersen. Fix generic_fls64(). tcp_cubic is using fls64(). Signed-off-by: Akinobu Mita <mita@miraclelinux.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Documentation: Updated PCI Error RecoveryLinas Vepstas2006-02-031-161/+311
| | | | | | | | | | This patch is a cleanup/restructuring/clarification of the PCI error handling doc. It should look rather professional at this point. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix build failure in recent pm_prepare_* changes.Dave Jones2006-02-031-4/+0
| | | | | | | | | | | kernel/power/power.h:49: error: static declaration of 'pm_prepare_console' follows non-static declaration include/linux/suspend.h:46: error: previous declaration of 'pm_prepare_console' was here kernel/power/power.h:50: error: static declaration of 'pm_restore_console' follows non-static declaration include/linux/suspend.h:47: error: previous declaration of 'pm_restore_console' was here Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Kprobes: Fix deadlock in function-return probesAnanth N Mavinakayanahalli2006-02-031-1/+1
| | | | | | | | | | | | | | | | When two function-return probes are inserted on kfree()[1] and the second on say, sys_link()[2], and later [2] is unregistered, we have a deadlock as kfree is called with the kretprobe_lock held and the function-return probe on kfree will also try to grab the same lock. However, we can move the kfree() during unregistration to outside the spinlock as we are sure that no instances from the free list will be used after synchronized_sched() returns during the unregistration process. Thanks to Masami Hiramatsu for spotting this. Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] kernel/kprobes.c: fix a warning #ifndef ARCH_SUPPORTS_KRETPROBESAdrian Bunk2006-02-031-17/+17
| | | | | | | | | | kernel/kprobes.c:353: warning: 'pre_handler_kretprobe' defined but not used Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Acked-by: "Keshavamurthy, Anil S" <anil.s.keshavamurthy@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] md: Make sure rdev->size gets set for version-1 superblocksNeilBrown2006-02-031-3/+5
| | | | | | | | | Sometimes it doesn't so make the code more like the version-0 code which works. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] md: Assorted little md fixesNeilBrown2006-02-035-5/+9
| | | | | | | | | | | | | | - version-1 superblock + The default_bitmap_offset is in sectors, not bytes. + the 'size' field in the superblock is in sectors, not KB - raid0_run should return a negative number on error, not '1' - raid10_read_balance should not return a valid 'disk' number if ->rdev turned out to be NULL - kmem_cache_destroy doesn't like being passed a NULL. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] md: Handle overflow of mdu_array_info_t->size betterNeilBrown2006-02-031-2/+4
| | | | | | | | | | | | | | | | | | | | mdu_array_info_t->size is 'int', which isn't big enough for the size (in KB of each component in) some arrays. So rather than a random overflow, set size to -1 when it cannot be set correctly. To update aspect on an array, userspace will sometimes: get_array_info change one field set_array_info in this case, we don't want the '-1' in 'size' to change to size, or look like a size change at all. So test for that in update_array_info. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Clean up Documentation/driver-model/overview.txtLinas Vepstas2006-02-031-32/+25
| | | | | | | | | | | | | | | | Edits to the driver-model documentation for grammar, clarity and content. These docs haven't been updated in years, and some of the technical content and discussion has become stale; this patch updates these. In addition, some of the language is awkward. Fix this. (I'm trying to cleanup the other files in this directory also, patches for these will come a bit later). Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Acked-by: Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix RocketPort driverMichal Ostrowski2006-02-031-1/+1
| | | | | | | | | | Call "ld->receive_buf" using the start of the character and flag buffers, rather than the ends. Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Linux v2.6.16-rc2v2.6.16-rc2Linus Torvalds2006-02-021-1/+1
|
* Merge branch 'master' of ↵Trond Myklebust2006-02-02271-8793/+9399
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
| * [PATCH] device-mapper log bitset: fix big endian find_next_zero_bitStefan Bader2006-02-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix to the device-mapper-log-bitset-fix-endian patch that switched to ext2_* versions of the set and clear bit functions. The find_next_zero_bit function also has to be the ext2 one. Otherwise the mirror target tries to recover non-existent regions beyond the end of device. Signed-off-by: Stefan Bader <shbader@de.ibm.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] md: Add sysfs access to raid6 stripe cache sizeNeilBrown2006-02-021-34/+115
| | | | | | | | | | | | | | | | | | .. just as we already have for raid5. Signed-off-by: Neil Brown <neilb@suse.de> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] md: Don't remove bitmap from md array when switching to read-onlyNeilBrown2006-02-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | While a read-only array doesn't not really need a bitmap, we should not remove the bitmap when switching an array to read-only because a/ There is no code to re-add the bitmap which switching to read-write, b/ There is insufficient locking - the bitmap could be accessed while it is being removed. Cc: Reuben Farrelly <reuben-lkml@reub.net> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] md: Make sure array geometry changes persist with version-1 superblocksNeilBrown2006-02-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | super_1_sync only updates fields in the superblock that might have changed. 'raid_disks' and 'size' could have changed, but this information doesn't get updated.... until this patch. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] md: Fix device-size updates in mdNeilBrown2006-02-021-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As 'array_size' is a 'sector_t', it may overflow inappropriately when shifted 10 bits. So We should cast it to a loff_t first. There are two places with this problem, but the second (in update_raid_disks) isn't needed so just remove it: The only personality that handles ->reshape currently is raid1, and it doesn't change the size of the array. When added for raid5/6, reshape again won't change the size of the array, at least not straight away. This code might be need for reshaping 'linear' but linear->shape, if implemented, should probably do the i_size_write itself. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Merge branch 'drm-linus' of ↵Linus Torvalds2006-02-0228-175/+248
| |\ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
| | * sem2mutex: drivers/char/drm/Dave Airlie2006-02-0211-125/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Arjan van de Ven <arjan@infradead.org> Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: drivers/char/drm/: make some functions staticDave Airlie2006-02-0210-23/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Adrian Bunk <bunk@stusta.de> This patch makes some needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: Fixes sparse warnings in via_dmablit.cDave Airlie2006-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the following sparse warnings: drivers/char/drm/via_dmablit.c:111:35: warning: Using plain integer as NULL pointer drivers/char/drm/via_dmablit.c:584:23: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: i915 patches from Tungsten GraphicsDave Airlie2006-01-254-14/+98
| | | | | | | | | | | | | | | | | | | | | | | | Fix CMDBUFFER path, add heap destroy and flesh out sarea for rotation (Tungsten Graphics) From: Alan Hourihane <alanh@tungstengraphics.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: ati_pcigart: simplify page_count manipulationsDave Airlie2006-01-251-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Nick Piggin <npiggin@suse.de> Allocate a compound page for the user mapping instead of tweaking the page refcounts. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: use NULL instead of 0Dave Airlie2006-01-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Randy Dunlap <rdunlap@xenotime.net> Use NULL instead of 0 (sparse warnings): drivers/char/drm/ati_pcigart.c:64:10: warning: Using plain integer as NULL pointer drivers/char/drm/ati_pcigart.c:130:21: warning: Using plain integer as NULL pointer drivers/char/drm/ati_pcigart.c:171:14: warning: Using plain integer as NULL pointer Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: add X600 PCI IDsDave Airlie2006-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Brice Goglin <Brice.Goglin@ens-lyon.org> Now that Xorg 6.9/7.0 has been released, DRI is supported on more Radeon cards without ATI proprietary drivers. I got my X300 to work without problem. But, another Radeon X600 required to add its PCI ids to the Radeon driver. Patch is attached. I can't be sure about the "CHIP_RV350", I copied it from the X300 entry (from http://dri.freedesktop.org/wiki/ATIRadeon, X600 is a rv380 chip while X300 is a rv370). But, at least it works now. Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: add i945GM PCI IDDave Airlie2006-01-251-0/+1
| | | | | | | | | | | | | | | From: Charles F. Johnson <charles.f.johnson@intel.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| | * drm: Fix sparce warning in radeon driverDave Airlie2006-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Luiz Fernando Capitulino <lcapitulino@mandriva.com.br> drivers/char/drm/radeon_cp.c:1643:31: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | [PATCH] Fix sgiioc4 DMA timeout problem with 64KiB s/g elements.Jeremy Higdon2006-02-021-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem caused by the fact that the code used to only pick the low 16 bits of the bytecount. That may be how some controllers act on it (byte count of 0 means 0x10000), but not for this particular hardware. Signed-off-by: Jeremy Higdon <jeremy@sgi.com> Acked-by: Jes Sorensen <jes@sgi.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsaLinus Torvalds2006-02-0134-111/+364
| |\ \
| | * | [ALSA] hda-codec - Fix typos in alc882 model tableTakashi Iwai2006-02-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modules: HDA Codec driver Fixed typos in alc882 model table. Signed-off-by: Takashi Iwai <tiwai@suse.de>
View Lorry Controller Status