aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2007-02-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] CLPS7500 doesn't have IO ports [ARM] Fix more apm-emulation.h [ARM] 4234/1: Introduce get_irqnr_preamble and arch_ret_to_user for ns9xxx. [ARM] 4233/1: nand/s3c2410.c: warning fix [ARM] 4226/1: initial .data and .bss mappings of XIP kernel should be TEXT_OFFSET [ARM] 4224/2: allow XIP kernel to boot again [ARM] 4232/1: AT91: Generic GPIO bug [ARM] 4231/1: AT91: Merge and typo fixes. [ARM] 4229/1: S3C2410: Add MACH_QT2410 to s3c2410_defconfig [ARM] 4228/2: S3C24XX: update s3c2410_defconfig for 2.6.21-rc1
| * [ARM] CLPS7500 doesn't have IO portsRussell King2007-02-26
| | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Fix more apm-emulation.hRussell King2007-02-26
| | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 4234/1: Introduce get_irqnr_preamble and arch_ret_to_user for ns9xxx.Uwe Kleine-König2007-02-25
| | | | | | | | | | | | | | | | This is a follow up for f80dff9da07d81da16e3b842118d47b9febf9c01 which didn't include adaption for the new ns9xxx machine support. Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 4233/1: nand/s3c2410.c: warning fixArnaud Patard2007-02-25
| | | | | | | | | | | | | | | | | | | | | | Noticed while building a s3c2410 kernel : drivers/mtd/nand/s3c2410.c: In function 's3c2440_nand_calculate_ecc': drivers/mtd/nand/s3c2410.c:476: warning: format '%06x' expects type 'unsigned int', but argument 3 has type 'long unsigned int' This patch fixes it. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 4226/1: initial .data and .bss mappings of XIP kernel should be ↵Nicolas Pitre2007-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TEXT_OFFSET aware Since TEXT_OFFSET is meant to determine RAM location for kernel use, itshould affect .data and .bss initial mapping in the XIP case. Otherwise a XIP kernel would crash if TEXT_OFFSET gets somewhat larger than 2MB. Corresponding code is also moved up a bit to be near the similar .text mapping code making the whole a bit more straight forward to understand. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 4224/2: allow XIP kernel to boot againNicolas Pitre2007-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2552fc27ff79b10b9678d92bcaef21df38bb7bb6 XIP kernels failed to boot because (_end - PAGE_OFFSET - 1) is much smaller than the size of the kernel text and data in the XIP case, causing the kernel not to be entirely mapped. Even in the non-XIP case, the use of (_end - PAGE_OFFSET - 1) is wrong because it produces a too large value if TEXT_OFFSET is larger than 1MB. Finally the original code was performing one loop too many. Let's break the loop when the section pointer has passed the last byte of the kernel instead. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 4232/1: AT91: Generic GPIO bugAndrew Victor2007-02-22
| | | | | | | | | | | | | | | | | | The new gpio_direction_input() and gpio_direction_output() functions were both enabling output mode. When configuring a GPIO for input mode, you need to program the ODR (Output Disable Register). Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 4231/1: AT91: Merge and typo fixes.Andrew Victor2007-02-22
| | | | | | | | | | | | | | | | | | | | | | The duplicate file "include/asm-arm/arch-at91rm9200/entry-macro.S" can be removed - it was already moved to include/asm-arm/arch-at91/. Fix 3 small typo's - two in comments, and the incorrect clock was specified for the LCD device. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 4229/1: S3C2410: Add MACH_QT2410 to s3c2410_defconfigBen Dooks2007-02-22
| | | | | | | | | | | | | | | | Add the Armzone QT2410 to the list of built machines in the s3c2410_defconfig Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 4228/2: S3C24XX: update s3c2410_defconfig for 2.6.21-rc1Ben Dooks2007-02-22
| | | | | | | | | | | | | | Udpate s3c2410_defconfig for 2.6.21-rc1 Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'for-linus' of ↵Linus Torvalds2007-02-26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IPoIB: Correct debugging output when path record lookup fails RDMA/cxgb3: Stop the EP Timer on BAD CLOSE RDMA/cxgb3: cleanups RDMA/cma: Remove unused node_guid from cma_device structure IB/cm: Remove ca_guid from cm_device structure RDMA/cma: Request reversible paths only IB/core: Set hop limit in ib_init_ah_from_wc correctly IB/uverbs: Return correct error for invalid PD in register MR IPoIB: Remove unused local_rate tracking IPoIB/cm: Improve small message bandwidth IB/mthca: Make 2 functions static
| * | IPoIB: Correct debugging output when path record lookup failsRoland Dreier2007-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If path_rec_completion() is passed a non-NULL path record pointer along with an unsuccessful status value, the tracing code incorrectly prints the (invalid) DLID from the path record rather than the more interesting status code. The actual logic of the function correctly uses the path record only if the status indicates a successful lookup. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | RDMA/cxgb3: Stop the EP Timer on BAD CLOSESteve Wise2007-02-23
| | | | | | | | | | | | | | | | | | | | | | | | Stop the ep timer in ec_status() if the status indicates a bad close. Signed-off-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | RDMA/cxgb3: cleanupsAdrian Bunk2007-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - don't mark static functions in C files as inline - gcc should know best whether inlining makes sense - never compile the unused cxio_dbg.c - make the following needlessly global functions static: - cxio_hal.c: cxio_hal_clear_qp_ctx() - iwch_provider.c: iwch_get_qp() - remove the following unused global functions: - cxio_hal.c: cxio_allocate_stag() - cxio_resource.: cxio_hal_get_rhdl() - cxio_resource.: cxio_hal_put_rhdl() Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | RDMA/cma: Remove unused node_guid from cma_device structureSean Hefty2007-02-22
| | | | | | | | | | | | | | | Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | IB/cm: Remove ca_guid from cm_device structureSean Hefty2007-02-22
| | | | | | | | | | | | | | | | | | | | | The cm_device references an ib_device, which already contains the node_guid. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | RDMA/cma: Request reversible paths onlySean Hefty2007-02-22
| | | | | | | | | | | | | | | | | | | | | | | | The rdma_cm requires that path records be reversible. Set the reversible bit when issuing an path record query. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | IB/core: Set hop limit in ib_init_ah_from_wc correctlySean Hefty2007-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | The hop_limit value in the ah_attr should be 0xFF, not the value read from the received GRH (which should be 0). See 13.5.4.4 in the 1.2 IB spec. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | IB/uverbs: Return correct error for invalid PD in register MRRoland Dreier2007-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no matching PD is found in ib_uverbs_reg_mr(), then the function jumps to err_release without setting the return value ret. This means that ret will hold the return value of the call to ib_umem_get() a few lines earlier; if the function reaches the point where it looks for the PD, we know that ib_umem_get() must have returned 0, so ib_uverbs_reg_mr() ends up return 0 for a bad PD ID. Fix this by setting ret to -EINVAL before jumping to the exit path when no PD is found. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | IPoIB: Remove unused local_rate trackingRoland Dreier2007-02-21
| | | | | | | | | | | | | | | | | | | | | | | | Now that low-level drivers handle the conversion from an absolute rate to a relative rate, there's no need for the IPoIB driver to keep track of the local port's data rate. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | IPoIB/cm: Improve small message bandwidthMichael S. Tsirkin2007-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid the overhead of freeing/reallocating and mapping/unmapping for DMA pages that have not been written to by hardware. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | IB/mthca: Make 2 functions staticAdrian Bunk2007-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the needlessly global functions mthca_tavor_write_mtt_seg() and mthca_arbel_write_mtt_seg() static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Roland Dreier <rolandd@cisco.com>
* | | [PATCH] Fix oops in pata_pcmciaAlan2007-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change to the devres layer re-orders the execution of cleanup functions and in turn causes the pcmcia layer to oops as it zaps a pointer now needed later on. We simply leave the pointer alone. Signed-off-by: Alan Cox <alan@redhat.com> Acked-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | [PATCH] Make hvc_console.c compile on non-powerpc: Remove NO_IRQRusty Russell2007-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Paulus preferred this over #defining NO_IRQ in the file, since that's 0 for powerpc anyway. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Acked-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | [PATCH] Fix build-failure in drivers/video/s3fb.cOndrej Zajicek2007-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toralf Förster pointed out that drivers/video/s3fb.c would fail to compile: > ... > CC drivers/video/s3fb.o > drivers/video/s3fb.c: In function `s3_pci_remove': > drivers/video/s3fb.c:1003: warning: unused variable `par' > drivers/video/s3fb.c: In function `s3fb_setup': > drivers/video/s3fb.c:1141: error: `mtrr' undeclared (first use in this function) > drivers/video/s3fb.c:1141: error: (Each undeclared identifier is reported only once > drivers/video/s3fb.c:1141: error: for each function it appears in.) > make[2]: *** [drivers/video/s3fb.o] Error 1 > make[1]: *** [drivers/video] Error 2 > make: *** [drivers] Error 2 Here is fix, it also fixes broken boot options. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | [PATCH] x86: add -freg-struct-return to CFLAGSIngo Molnar2007-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jeremy Fitzhardinge suggested the use of -freg-struct-return, which does structure-returns (such as when using pte_t) in registers instead of on the stack. that is indeed so, and this option reduced the kernel size a bit: text data bss dec hex filename 4799506 543456 3760128 9103090 8ae6f2 vmlinux.before 4798117 543456 3760128 9101701 8ae185 vmlinux.after the resulting kernel booted fine on my testbox. Lets go for it. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | [PATCH] add MAINTAINERS entry for high-res timers, clockevents, dynticksIngo Molnar2007-02-26
| | | | | | | | | | | | | | | | | | | | | | | | Thomas is the maintainer and primary author of the high-res timers, clockevents and dynticks code. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6Linus Torvalds2007-02-26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (78 commits) [PARISC] Use symbolic last syscall in __NR_Linux_syscalls [PARISC] Add missing statfs64 and fstatfs64 syscalls Revert "[PARISC] Optimize TLB flush on SMP systems" [PARISC] Compat signal fixes for 64-bit parisc [PARISC] Reorder syscalls to match unistd.h Revert "[PATCH] make kernel/signal.c:kill_proc_info() static" [PARISC] fix sys_rt_sigqueueinfo [PARISC] fix section mismatch warnings in harmony sound driver [PARISC] do not export get_register/set_register [PARISC] add ENTRY()/ENDPROC() and simplify assembly of HP/UX emulation code [PARISC] convert to use CONFIG_64BIT instead of __LP64__ [PARISC] use CONFIG_64BIT instead of __LP64__ [PARISC] add ASM_EXCEPTIONTABLE_ENTRY() macro [PARISC] more ENTRY(), ENDPROC(), END() conversions [PARISC] fix ENTRY() and ENDPROC() for 64bit-parisc [PARISC] Fixes /proc/cpuinfo cache output on B160L [PARISC] implement standard ENTRY(), END() and ENDPROC() [PARISC] kill ENTRY_SYS_CPUS [PARISC] clean up debugging printks in smp.c [PARISC] factor syscall_restart code out of do_signal ... Fix conflict in include/linux/sched.h due to kill_proc_info() being made publicly available to PARISC again.
| * | | [PARISC] Use symbolic last syscall in __NR_Linux_syscallsKyle McMartin2007-02-21
| | | | | | | | | | | | | | | | | | | | | | | | Hopefully will prevent people from forgetting to update this... Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] Add missing statfs64 and fstatfs64 syscallsGuy Martin2007-02-21
| | | | | | | | | | | | | | | | Signed-off-by: Guy Martin <gmsoft@tuxicoman.be>
| * | | Revert "[PARISC] Optimize TLB flush on SMP systems"Kyle McMartin2007-02-18
| | | | | | | | | | | | | | | | | | | | This reverts commit 592ac93a607109e0643da6c23ae07ac749e973b1 which causes SMP machines with maxcpus > 1 to fail to boot...
| * | | [PARISC] Compat signal fixes for 64-bit pariscCarlos O'Donell Jr2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In copy_siginfo_from_user32: Use compat_uptr_t. Use compat_ptr(). In copy_siginfo_to_user32: Use compat_int_t. Use ptr_to_compat(). The sigevent_t structure has a 64-bit si_ptr field that when copied to a 32-bit si_ptr will copy the wrong word. For the compat copy use the si_int field instead. Signed-off-by: Carlos O'Donell <carlos@systemhalted.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] Reorder syscalls to match unistd.hCarlos O'Donell Jr2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move migrate_pages into the same position as specified in unistd.h. This fixes migrate_pages, pselect6 and ppoll syscalls. Signed-off-by: Carlos O'Donell <carlos@systemhalted.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | Revert "[PATCH] make kernel/signal.c:kill_proc_info() static"Matthew Wilcox2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d3228a887cae75ef2b8b1211c31c539bef5a5698. DeBunk this code. We need it for compat_sys_rt_sigqueueinfo. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] fix sys_rt_sigqueueinfoKyle McMartin2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the parisc affecting portion of the patch was inadvertantly reverted a while ago. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] fix section mismatch warnings in harmony sound driverHelge Deller2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for two warnings: - Section mismatch: reference to .init.text:snd_harmony_mixer_init from .text.snd_harmony_probe after 'snd_harmony_probe' - Section mismatch: reference to .init.text:snd_harmony_mixer_reset from .text.snd_harmony_mixer_init after 'snd_harmony_mixer_init' Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] do not export get_register/set_registerHelge Deller2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - noticed by Randolph Chung (tausq) Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] add ENTRY()/ENDPROC() and simplify assembly of HP/UX emulation codeHelge Deller2007-02-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] convert to use CONFIG_64BIT instead of __LP64__Helge Deller2007-02-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] use CONFIG_64BIT instead of __LP64__Helge Deller2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - additionally update my copyright timestamps Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] add ASM_EXCEPTIONTABLE_ENTRY() macroHelge Deller2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this macro unifies the code to add exception table entries - additionally use ENTRY()/ENDPROC() at more places Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] more ENTRY(), ENDPROC(), END() conversionsHelge Deller2007-02-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] fix ENTRY() and ENDPROC() for 64bit-pariscHelge Deller2007-02-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] Fixes /proc/cpuinfo cache output on B160LHelge Deller2007-02-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] implement standard ENTRY(), END() and ENDPROC()Helge Deller2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the macros in entry.S Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] kill ENTRY_SYS_CPUSKyle McMartin2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | it's unlikely iCOD will ever happen on parisc-linux now... ;-) Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] clean up debugging printks in smp.cKyle McMartin2007-02-17
| | | | | | | | | | | | | | | | Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] factor syscall_restart code out of do_signalKyle McMartin2007-02-17
| | | | | | | | | | | | | | | | | | | | | | | | looks better this way... ;) Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] rename *_ANY_ID to PA_*_ANY_ID in the exported headerKyle McMartin2007-02-17
| | | | | | | | | | | | | | | | Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-03 15:55:10 -0500