aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [BLOCK] elevator: if specified scheduler is not found, fall back to defaultJens Axboe2006-01-16
| | | | Signed-off-by: Jens Axboe <axboe@suse.de>
* [BLOCK] elevator: Make elevator=as work again for anticipatoryChuck Ebbert2006-01-16
| | | | | 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-16
| | | | | | | the ladder to the mainline. Add it back. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jens Axboe <axboe@suse.de>
* 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>
| * | powerpc: Make ARCH=powerpc the default for 32-bit ppcPaul Mackerras2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes ARCH=powerpc the default on 32-bit powerpc machines, where uname -m returns ppc, as well as on 64-bit powerpc machines. Most people who would be likely to build their own kernels on 32-bit powerpc machines would be using powermacs or CHRP machines, both of which are supported with ARCH=powerpc now. Embedded ppc developers whose ports haven't been moved over to arch/powerpc yet will have to explicitly set ARCH=ppc now. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [PATCH] ppc: Remove powermac support from ARCH=ppcPaul Mackerras2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to build kernels for PReP and/or CHRP with ARCH=ppc by removing the (non-building) powermac support. It's now also possible to select PReP and CHRP independently. Powermac users should now build with ARCH=powerpc instead of ARCH=ppc. (This does mean that it is no longer possible to build a 32-bit kernel for a G5.) Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [PATCH] powerpc: Kconfig changes for CRASH_DUMPHaren Myneni2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed in 2.6.15-git9 that CRASH_DUMP option is moved to top level. Moved CRASH_DUMP into "kernel options" next to KEXEC and this config option supports only for PPC64 at this time. Signed-off-by: Haren Myneni <haren@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [PATCH] powerpc: Update pmac32_defconfigBenjamin Herrenschmidt2006-01-15
| | | | | | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [PATCH] powerpc: Fix Maple buildBenjamin Herrenschmidt2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | The changes to the device node structure broke Maple build. This fixes it. Unfortunately I coudn't test as my Maple board appears to be dead. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [PATCH] powerpc: Fix kdump copy regs and dynamic allocate per-cpu crash notesHaren Myneni2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This contains the arch specific changes for the following the kdump generic fixes which were already accepted in the upstream. . Capturing CPU registers (for the case of 'panic' and invoking the dump using 'sysrq-trigger') from a function (stack frame) which will be not be available during the kdump boot. Hence, might result in invalid stack trace. . Dynamically allocating per cpu ELF notes section instead of statically for NR_CPUS. - Fix the compiler warning in prom_init.c. Signed-off-by: Haren Myneni <haren@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | powerpc/32: Generate miboot images with ARCH=powerpcPaul Mackerras2006-01-14
| |/ | | | | | | | | | | | | | | Miboot images are apparently still used on some old 32-bit powermacs, so build them with ARCH=powerpc if we're 32-bit and powermac support is enabled. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | x86: Work around compiler code generation bug with -OsLinus Torvalds2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some versions of gcc generate incorrect code for the inet_check_attr() function, apparently due to a totally bogus index -> pointer comparison transformation. At least "gcc version 4.0.1 20050727 (Red Hat 4.0.1-5)" from FC4 is affected, possibly others too. This changes the function subtly so that the buggy gcc transformation doesn't trigger. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2006-01-14
|\ \
| * | [SERIAL] serial8250: convert to the new platform device interfaceDmitry Torokhov2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | Do not use platform_device_register_simple() as it is going away. Also set up driver's owner to create link driver->module in sysfs. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [SERIAL] fix SERIAL_M32R_PLDSIO dependenciesAdrian Bunk2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a typo in the dependencies reported by Jean-Luc Leger <reiga@dspnet.fr.eu.org>. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [SERIAL] convert uart_state.sem to uart_state.mutexIngo Molnar2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | semaphore to mutex conversion. the conversion was generated via scripts, and the result was validated automatically via a script as well. build and boot tested. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-mmcLinus Torvalds2006-01-14
|\ \ \
| * | | [MMC] mmc_blk_probe() warning fixAndrew Morton2006-01-13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/mmc/mmc_block.c: In function `mmc_blk_probe': drivers/mmc/mmc_block.c:467: warning: long unsigned int format, different type arg (arg 5) We don't know what size sector_t is - cast it. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-01-14
|\ \ \
| * | | [ARM] 3262/4: allow ptraced syscalls to be overridenNicolas Pitre2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre This is needed by strace to properly handle the tracing of some system calls. It could be useful for other applications as well. Based on an earlier patch from Daniel Jacobowitz. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Daniel Jacobowitz <dan@debian.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 3112/1: old ABI compat: config option to turn it onNicolas Pitre2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre Enjoy ! Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 3111/2: old ABI compat: adjust NWFPE to be operational within an EABI ↵Nicolas Pitre2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kernel Patch from Nicolas Pitre We need NWFPE if we want to support execution of legacy binaries with an EABI kernel. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 3110/5: old ABI compat: multi-ABI syscall entry supportNicolas Pitre2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre This patch adds the required code to support both user space ABIs at the same time. A second syscall table is created to include legacy ABI syscalls that need an ABI compat wrapper. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 3109/1: old ABI compat: syscall wrappers for ABI impedance matchingNicolas Pitre2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre The difference between EABI and the legacy ABI may affect either structure member alignment and/or argument register selection. The patch has the details. Included are wrappers for the following syscalls: sys_stat64 sys_lstat64 sys_fstat64 sys_fcntl64 sys_epoll_ctl sys_epoll_wait sys_ipc sys_semop sys_semtimedop sys_pread64 sys_pwrite64 sys_truncate64 sys_ftruncate64 sys_readahead Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 3108/2: old ABI compat: statfs64 and fstatfs64Nicolas Pitre2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre struct statfs64 has extra padding with EABI growing its size from 84 to 88. This struct is now __attribute__((packed,aligned(4))) with a small assembly wrapper to force the sz argument to 84 if it is 88 to avoid copying the extra padding over user space memory unexpecting it. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-22 22:35:13 -0500