aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [AGPGART] 945GM support for agpgartAlan Hourihane2006-01-19
| | | | | | | | | Here's a very small diff for 945GM support for agpgart. Patch against 2.6.15. From: Alan Hourihane <alanh@fairlite.demon.co.uk> Signed-off-by: Dave Jones <davej@redhat.com>
* [AGPGART] Semaphore to Mutex conversion.akpm@osdl.org2006-01-16
| | | | | | | | | | | | 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 Jones <davej@redhat.com>
* [AGPGART] Suspend/Resume support for ATI GARTakpm@osdl.org2006-01-16
| | | | | | | | | Add suspend/resume support for the ati-agp module Signed-off-by: Jaco Kroon <jaco@kroon.co.za> Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Jones <davej@redhat.com>
* [AGPGART] Suspend/Resume support for AMD64 GART.akpm@osdl.org2006-01-16
| | | | | | | | | | This adds support for suspend/resume to the amd64-agp driver. Without it, X displays garbage after resume from swsusp. Signed-off-by: Michal Schmidt <xschmi00@stud.feec.vutbr.cz> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Jones <davej@redhat.com>
* [AGPGART] Loop cleanupDaniel =?ISO-8859-1?Q?Marjam=E4ki2006-01-16
| | | | | | | | The loop contains a command that is only used in the last iteration. I moved the command outside the loop. Compile-tested Signed-off-by: Daniel Marjamäki <daniel.marjamaki at comhem.se> Signed-off-by: Dave Jones <davej@redhat.com>
* [PATCH] hrtimer comment tweakJonathan Corbet2006-01-16
| | | | | | | Fix a comment which missed an update cycle somewhere. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge git://oss.sgi.com:8090/oss/git/xfs-2.6Linus Torvalds2006-01-16
|\
| * Make alloc_page_buffers() initialise buffer_heads using init_buffer(),Nathan Scott2006-01-16
| | | | | | | | | | | | | | | | like other routines here, to ensure buffers are correctly initialised with respect to b_private/b_end_io. Fixes an odd interaction between XFS and reiserfs. Signed-off-by: Nathan Scott <nathans@sgi.com>
* | [PATCH] Fix drivers/block/ps2esdi.c compileJens Axboe2006-01-16
| | | | | | | | Looks like fallout from the geo stuff.
* | Merge branch 'for-linus' of ā†µLinus Torvalds2006-01-16
|\ \ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
| * | Actually remove amdtp.[ch], cmp.[ch].Jody McIntyre2006-01-16
| |/ | | | | | | | | | | | | The feature removal was done in 7301c8d3a05dc52d33598364da7c4eb6ab6357eb but these files were not removed for some reason. Signed-off-by: Jody McIntyre <scjody@modernduck.com>
* | x86-64: fix initrd freeingLinus Torvalds2006-01-16
| | | | | | | | | | | | | | | | The comparison of the initrd start address against "&_end" is unnecessary and incorrect. Make it match the x86 code that just compares the passed-in arguments. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: Increase NR_IRQ_VECTORS to 32 * NR_CPUSAndi Kleen2006-01-16
| | | | | | | | | | | | | | | | | | | | This prevents running out of GSIs on large Unisys ES7000 machines. Follows i386 Cc: "Protasevich, Natalie" <Natalie.Protasevich@unisys.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: Don't try to put kernel page tables beyond ZONE_DMA32.Andi Kleen2006-01-16
| | | | | | | | | | | | | | | | | | | | | | For not fully explained reasons it broke mem=... on several setups. Also minor cleanup. Cc: axboe@suse.de Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: set do_not_nx as cpuinitdataAndi Kleen2006-01-16
| | | | | | | | | | | | | | | | 'check_efer' uses 'do_not_nx'. Hotpluged CPU could wrongly disable NX. Signed-off-by: Shaohua Li<shaohua.li@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: lapic resume uses correct base addressShaohua Li2006-01-16
| | | | | | | | | | | | | | | | uses correct lapic base address. The set_fixmap appears useless. Signed-off-by: Shaohua Li<shaohua.li@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: Only let user select PM timer support when EMBEDDEDAndi Kleen2006-01-16
| | | | | | | | | | | | | | | | | | | | To avoid mistakes. I got a few reports where people got broken timing because they didn't have the PMTIMER fallback. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: Allow nesting of int3 by default for kprobesAndi Kleen2006-01-16
| | | | | | | | | | | | | | | | | | | | | | This unbreaks recursive kprobes which didn't work anymore due to an earlier patch which converted the debug entry point to use an IST. This also allows nesting of the debug entry point too. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: Mark powernow k8 init functions as __cpuinitAndi Kleen2006-01-16
| | | | | | | | | | | | | | | | | | | | | | | | | | cpufreq init can be called when a CPU is set online. Need to make powernow-k8's initialisation functions __cpuinit to prevents oopses when a CPU is off/onlined on a AMD system Cc: trenn@suse.de Cc: mark.langsdorf@amd.com Cc: davej@redhat.com Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuildLinus Torvalds2006-01-16
|\ \ | |/ |/|
| * kbuild: fix 'make all install_modules install'Sam Ravnborg2006-01-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command 'make all modules_install install' would fail in a virgin tree - pointing at a non-existing directory under /lib/modules/xxx KERNELRELEASE is part of MODLIB and we need to create .kernelrelease before we can properly evaluate KERNELRELEASE, Changing MODLIB to the recursively expanded flavor let it pick up the correct KERNELRELEASE value. Reported by: "Hemmann, Volker Armin" <volker.armin.hemmann@tu-clausthal.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * kbuild: create .kernelrelease at *config stepSam Ravnborg2006-01-16
| | | | | | | | | | | | | | | | | | | | | | | | To enable 'make kernelrelease' earlier now create .kernelrelease when one of the *config targets are used. Also introduce KERNELVERSION - only user is kconfig. KERNELVERSION was needed to display kernel version in menuconfig - KERNELRELEASE is not valid until configuration has completed. kconfig files modified to use KERNELVERSION. Bug reported by: Rene Rebe <rene@exactcode.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * kbuild: fix make -jN with multiple targets with O=...Sam Ravnborg2006-01-15
| | | | | | | | | | | | | | | | | | The way multiple targets was handled with make O=... broke because for each high-level target make spawned a parallel make resulting in a broken build. Reported by Keith Owens <kaos@ocs.com.au> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * kconfig: get rid of stray a.o, support ncurseswSam Ravnborg2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/kconfig/lxdialog/check-lxdialog.sh uses gcc to check for what libraries are present. Redirect output to /dev/null so we do not generate an a.out. Also included support for ncursesw - so if present prefer that instead of ncurses. The order is now (first is preferred): 1) ncursesw 2) ncurses 3) curses The latter is to support SunOS. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* | Merge git://oss.sgi.com:8090/oss/git/xfs-2.6Linus Torvalds2006-01-16
|\ \
| * | [XFS] remove no-longer-needed IS_NOATIME macro, twas just a build workaroundNathan Scott2006-01-16
| | | | | | | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Nathan Scott <nathans@sgi.com>
| * | [XFS] mutex fallout - fix debug builds and remove no-longer-useful comment.Nathan Scott2006-01-16
| | | | | | | | | | | | Signed-off-by: Nathan Scott <nathans@sgi.com>
| * | [XFS] Fix symlink creation too, with respect to initialising SELinuxNathan Scott2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | context. SGI-PV: 946762 SGI-Modid: xfs-linux-melb:xfs-kern:24983a Signed-off-by: Nathan Scott <nathans@sgi.com>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2006-01-15
|\ \ \ | |/ / |/| |
| * | MAINTAINERS: CIFS: add linux-cifs-client@lists.samba.org listJesper Juhl2006-01-14
| | | | | | | | | | | | | | | | | | | | | Add linux-cifs-client@lists.samba.org to CIFS entry in MAINTAINERS Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | correct email address of Manfred SpraulChristian Kujau2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I tried to send the forcedeth maintainer an email, but it came back with: "The mail address manfreds@colorfullife.com is not read anymore. Please resent your mail to manfred@ instead of manfreds@." This patch fixes this. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | Spelling fix in init/Kconfig for the help of CONFIG_SWAPJesper Juhl2006-01-14
| | | | | | | | | | | | | | | | | | | | | Trivial spelling fix s/socalled/so called/ Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | return statement cleanup - kill pointless parenthesesJesper Juhl2006-01-14
| | | | | | | | | | | | | | | | | | | | | This patch removes pointless parentheses from return statements. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | remove unused LOCAL_END_REQUESTDomen Puncer2006-01-14
| | | | | | | | | | | | | | | | | | | | | Remove the last occurence of LOCAL_END_REQUEST. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | MAINTAINERS: better list for "POSIX CLOCKS and TIMERS"Horms2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POSIX CLOCKS and TIMERS disscussion is more appropriate on linux-kernel than linux-net. As suggested by the maintainer, George Anzinger. Signed-off-by: Horms <horms@verge.net.au> Acked-by: George Anzinger <george@mvista.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | Fix "stuct", "strut", "struc" typosAlexey Dobriyan2006-01-14
| | | | | | | | | | | | | | | Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | Documentation/hpet.txt typoRandy Dunlap2006-01-14
| | | | | | | | | | | | | | | | | | | | | Fix a typo. Requested by Petr Vandrovec. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | SOFTWARE_SUSPEND: fix a typo in the dependenciesAdrian Bunk2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a typo in the dependencies of SOFTWARE_SUSPEND. This patch is based on a report by Jean-Luc Leger <reiga@dspnet.fr.eu.org>. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Pavel Machek <pavel@ucw.cz>
| * | spelling: s/appropiate/appropriate/Adrian Bunk2006-01-14
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | drivers/net/{,wireless/}Kconfig: remove dead URLAdrian Bunk2006-01-14
| | | | | | | | | | | | | | | | | | shadow.cabi.net does no longer exist. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | ftape: remove some outdated information from Kconfig filesAdrian Bunk2006-01-14
| | | | | | | | | | | | | | | | | | | | | This patch removes some outdated information about the ftape driver like pointers to no longer existing webpages from Kconfig files. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | Spelling fix in IPW2100 and IPW2200 Kconfig entriesAlex Shepard2006-01-14
| |/ | | | | | | | | | | | | s/remvoed/removed/ Signed-off-by: Alex Shepard <ashepard@u.washington.edu> Signed-off-by: Adrian Bunk <bunk@stusta.de>
* | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-01-15
|\ \
| * | [ARM] Fix missing compiler.h includeRussell King2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asm/mach/arch.h introduced a __deprecated, but didn't include compiler.h, causing: In file included from arch/arm/mach-at91rm9200/devices.c:13: include/asm/mach/arch.h:23: warning: no semicolon at end of struct or union include/asm/mach/arch.h:23: error: syntax error before 'phys_ram' include/asm/mach/arch.h:34: error: syntax error before ':' token include/asm/mach/arch.h:35: error: syntax error before ':' token include/asm/mach/arch.h:36: error: syntax error before ':' token include/asm/mach/arch.h:37: error: syntax error before ':' token include/asm/mach/arch.h:45: error: syntax error before '}' token Add the necessary include. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [PATCH] MAINTAINERS: watchdog device driversWim Van Sebroeck2006-01-15
| | | | | | | | | | | | | | | | | | Add a MAINTAINER entry for the watchdog device drivers. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* | | [WATCHDOG] sa1100_wdt.c sparse cleanupsIan Campbell2006-01-15
| | | | | | | | | | | | | | | | | | | | | The following makes drivers/char/watchdog/sa1100_wdt.c sparse clean. Signed-off-by: Ian Campbell <icampbell@arcom.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* | | [PATCH] Use atomic64_set for 64-bit case of atomic_long_setKyle McMartin2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, the BITS_PER_LONG == 64 case of atomic_long_set was using atomic_set instead of atomic64_set. This does not jive with architectures which use an inline instead of a #define to implement their atomic_set() primitives. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] Fix zoran_card compilation warningJean Delvare2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following warning which was introduced in 2.6.15-git8 by commit 7408187d223f63d46a13b6a35b8f96b032c2f623: CC [M] drivers/media/video/zoran_card.o drivers/media/video/zoran_card.c: In function `zr36057_init': drivers/media/video/zoran_card.c:1053: warning: assignment makes integer from pointer without a cast Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2006-01-15
|\ \ \ | |/ / |/| |
| * | powerpc/32: Restore previous version of 32-bit PCI codePaul Mackerras2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | When I removed the powermac support from arch/ppc/kernel/pci.c, I overlooked the fact that that file is used in 32-bit ARCH=powerpc builds. To prevent problems in future, restore the original version of that file as arch/powerpc/kernel/pci_32.c, and use that. Signed-off-by: Paul Mackerras <paulus@samba.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-24 01:43:48 -0500