aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* mm: Fix problem of parameter in noteJianjun Kong2009-09-18
| | | | | | | | 'current' is a pointer, so the right form is 'down_write(&current->mm->mmap_sem)'. Signed-off-by: Jianjun Kong <jianjun@zeuux.org> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* kref: double kref_put() in my_data_handler()Roel Kluin2009-09-18
| | | | | | | | The kref_put() already occurs after the out label Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2009-09-18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] sizeof cleanup [WATCHDOG] wdt_pci: fix printk and variable type [WATCHDOG] wdt_pci - use pci_request_region [WATCHDOG] ar7_wdt: Fix error handling during probe. [WATCHDOG] ar7_wdt: convert to become a platform driver [WATCHDOG] fix book E watchdog to take WDIOC_SETTIMEOUT arg in seconds [WATCHDOG] davinci: use clock framework for timer frequency [WATCHDOG] Use DIV_ROUND_UP() macro in the coh901327 WDT [WATCHDOG] Add support for WM831x watchdog [WATCHDOG] Add watchdog driver for NUC900 [WATCHDOG] add SBC-FITPC2 watchdog driver
| * [WATCHDOG] sizeof cleanupWim Van Sebroeck2009-09-18
| | | | | | | | | | | | | | Use sizeof(*) instead of sizeof * (See Codingstyle documentation). Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] wdt_pci: fix printk and variable typeRandy Dunlap2009-09-18
| | | | | | | | | | | | | | | | | | | | | | | | Fix printk format warning: drivers/watchdog/wdt_pci.c:652: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'resource_size_t' and then use resource_size_t for the "io" variable as well so that it won't be truncated. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] wdt_pci - use pci_request_regionWim Van Sebroeck2009-09-18
| | | | | | | | | | | | | | Use pci_request_region instead of request_region for this pci_driver. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] ar7_wdt: Fix error handling during probe.Wim Van Sebroeck2009-09-18
| | | | | | | | | | | | | | | | Fix error handling in the probe function. Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Tested-by: Florian Fainelli <florian@openwrt.org>
| * [WATCHDOG] ar7_wdt: convert to become a platform driverFlorian Fainelli2009-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the ar7_wdt driver to become a platform driver. The AR7 SoC specific identification and base register calculation is performed by the board code, therefore we no longer need to have access to ar7_chip_id. We also remove the reboot notifier code to use the platform shutdown method as Wim suggested. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] fix book E watchdog to take WDIOC_SETTIMEOUT arg in secondsChris Friesen2009-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WDIOC_SETTIMEOUT argument is supposed to be a "seconds" value. However, the book E wdt currently treats it as a "period" which is interpreted in a board-specific way. This patch allows the user to pass in a "seconds" value and the driver will set the smallest timeout that is at least as large as specified by the user. It's been tested on e500 hardware and works as expected. The patch only modifies the CONFIG_FSL_BOOKE case, the CONFIG_4xx case is left unmodified as I don't have any hardware to test it on. Signed-off-by: Chris Friesen <cfriesen@nortel.com> Cc: Kumar Gala <galak@gate.crashing.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] davinci: use clock framework for timer frequencyKevin Hilman2009-09-18
| | | | | | | | | | | | | | | | | | | | Remove use of CLOCK_TICK_RATE in favor of using clock framework for getting timer frequency. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] Use DIV_ROUND_UP() macro in the coh901327 WDTLinus Walleij2009-09-18
| | | | | | | | | | | | | | | | | | | | I saw Julia Lawalls various commits fixing up the use of rounding macros and since my already submitted patch was not caught in this I took it upon myself to fix it up for this driver as well. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] Add support for WM831x watchdogMark Brown2009-09-18
| | | | | | | | | | | | | | | | | | | | | | | | The WM831x series of devices provide a watchdog with configurable behaviour on timer expiry. Currently this driver support refreshes via a register or GPIO line and autonomous refreshes from a hardware source (eg, a clock). Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] Add watchdog driver for NUC900Wan ZongShun2009-09-18
| | | | | | | | | | | | | | | | Add watchdog device driver for the Nuvoton NUC900 series SoCs. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] add SBC-FITPC2 watchdog driverDenis Turischev2009-09-18
| | | | | | | | | | | | | | | | | | | | Add support for watchdog found on SBC-FITPC2 board. Signed-off-by: Denis Turischev <denis@compulab.co.il> Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
* | Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-scoreLinus Torvalds2009-09-18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score: (22 commits) score: add TIF_NOTIFY_RESUME define in asm/thread_info.h score: make init_thread_union align to THREAD_SIZE score: update files according to review comments. score: add old syscall support score: add MEMORY_START and MEMORY_SIZE define, to make the code clear score: update inconsistent declare after .c was changed score: remove unused code, add include files in .c score: clean up mm/init.c score: make irq.h definitions local score: cleanups: dead code, 0 as pointer, shadowed variables score: fix function prototypes score: add address space annotations score: add missing #includes score: move save arg5 and arg6 instruction in front of enable_irq score: add prototypes for wrapped syscalls score: remove init_mm score: add generic sys_call_table score: remove __{put,get}_user_unknown score: unset __ARCH_WANT_IPC_PARSE_VERSION score: update files according to review comments ...
| * | score: add TIF_NOTIFY_RESUME define in asm/thread_info.hChen Liqin2009-09-17
| | |
| * | score: make init_thread_union align to THREAD_SIZEChen Liqin2009-08-30
| | |
| * | score: update files according to review comments.Chen Liqin2009-08-30
| | |
| * | score: add old syscall supportChen Liqin2009-08-30
| | |
| * | score: add MEMORY_START and MEMORY_SIZE define, to make the code clearChen Liqin2009-08-30
| | |
| * | score: update inconsistent declare after .c was changedChen Liqin2009-08-30
| | |
| * | score: remove unused code, add include files in .cChen Liqin2009-08-30
| | |
| * | Merge branch 'score' of ↵Chen Liqin2009-08-29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic into for-linus * 'score' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: score: clean up mm/init.c score: make irq.h definitions local score: cleanups: dead code, 0 as pointer, shadowed variables score: fix function prototypes score: add address space annotations score: add missing #includes score: move save arg5 and arg6 instruction in front of enable_irq score: add prototypes for wrapped syscalls score: remove init_mm score: add generic sys_call_table score: remove __{put,get}_user_unknown score: unset __ARCH_WANT_IPC_PARSE_VERSION score: update files according to review comments score: add maintainers for score architecture score: Add support for Sunplus S+core architecture
| | * | score: clean up mm/init.cArnd Bergmann2009-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | score does not need multiple zero pages, because it does not suffer from cache aliasing problems, so simplify that code. Also make some functions static and include the appropriate header files. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: make irq.h definitions localArnd Bergmann2009-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some internal definitions of the interrupt controller are only needed in irq.c, so move them out of the global irq.h header. Also add proper __iomem annotations for sparse. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: cleanups: dead code, 0 as pointer, shadowed variablesArnd Bergmann2009-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few smaller issues found by sparse, some code that was never used, two instances of '0' instead of 'NULL' and local variables shadowing another one. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: fix function prototypesArnd Bergmann2009-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Syscalls should return 'long' and be marked as 'asmlinkage'. Functions that are only used in a single file should be 'static'. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: add address space annotationsArnd Bergmann2009-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Annotate the address space for pointers that are used correctly with __user and __iomem, so that sparse can better warn about incorrect casts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: add missing #includesArnd Bergmann2009-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files that define a global function should #include the header with its declaration to make sure that the prototypes do not diverge. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: move save arg5 and arg6 instruction in front of enable_irqChen Liqin2009-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because enable_irq clobber r8 before arg5 was saved. modified: arch/score/kernel/entry.S Signed-off-by: Chen Liqin <liqin.chen@sunplusct.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: add prototypes for wrapped syscallsArnd Bergmann2009-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Every system call should be declared, so this adds missing declarations for the ones we were missing so far. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: remove init_mmArnd Bergmann2009-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | init_mm is now part of the common code and not provided by the architecture any more. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: add generic sys_call_tableArnd Bergmann2009-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds back a sys_call_table to the score architecture, which got lost in the conversion to the generic unistd.h file. It's rather worrying that the code got submitted without a system call table, which evidently means that it got zero testing. Since the system call table has a different layout from the old one (which was modeled after the mips-o32 one), I also try to fix the entry.S path to use it. In the modified calling conventions, all system call arguments are passed as registers r4 through r9, instead of r4 through r7 plus stack for the fifth and sixth argument. This matches what other architectures to when they normally pass arguments on the stack. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: remove __{put,get}_user_unknownArnd Bergmann2009-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The point of these extern declarations is to provoke a link error, so an architecture must not provide a symbol for them. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: unset __ARCH_WANT_IPC_PARSE_VERSIONArnd Bergmann2009-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This really should not be needed. The change for not changing the IPC code for every new architecture just went into 2.6.31, so we can skip it now. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: update files according to review commentsChen Liqin2009-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: arch/score/include/asm/cacheflush.h modified: arch/score/include/asm/delay.h modified: arch/score/include/asm/errno.h modified: arch/score/include/asm/pgtable-bits.h modified: arch/score/include/asm/pgtable.h modified: arch/score/include/asm/ptrace.h modified: arch/score/include/asm/unistd.h modified: arch/score/kernel/entry.S modified: arch/score/kernel/process.c modified: arch/score/kernel/ptrace.c modified: arch/score/kernel/signal.c modified: arch/score/kernel/sys_score.c modified: arch/score/kernel/traps.c modified: arch/score/mm/cache.c Signed-off-by: Chen Liqin <liqin.chen@sunplusct.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: add maintainers for score architectureChen Liqin2009-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chen Liqin <liqin.chen@sunplusct.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | score: Add support for Sunplus S+core architectureChen Liqin2009-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the complete set of new arch Score's files for linux. Score instruction set support 16bits, 32bits and 64bits instruction, Score SOC had been used in game machine and LCD TV. Signed-off-by: Chen Liqin <liqin.chen@sunplusct.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2009-09-18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (262 commits) sh: mach-ecovec24: Add user debug switch support sh: Kill off unused se_skipped in alignment trap notification code. sh: Wire up HAVE_SYSCALL_TRACEPOINTS. video: sh_mobile_lcdcfb: use both register sets for display panning video: sh_mobile_lcdcfb: implement display panning sh: Fix up sh7705 flush_dcache_page() build. sh: kfr2r09: document the PLL/FLL <-> RF relationship. sh: mach-ecovec24: need asm/clock.h. sh: mach-ecovec24: deassert usb irq on boot. sh: Add KEYSC support for EcoVec24 sh: add kycr2_delay for sh_keysc sh: cpufreq: Include CPU id in info messages. sh: multi-evt support for SH-X3 proto CPU. sh: clkfwk: remove bogus set_bus_parent() from SH7709. sh: Fix the indication point of the liquid crystal of AP-325RXA(AP3300) sh: Add EcoVec24 romImage defconfig sh: USB disable process is needed if romImage boot for EcoVec24 sh: EcoVec24: add HIZA setting for LED sh: EcoVec24: write MAC address in boot sh: Add romImage support for EcoVec24 ...
| * | | | sh: mach-ecovec24: Add user debug switch supportKuninori Morimoto2009-09-17
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | | sh: Kill off unused se_skipped in alignment trap notification code.Paul Mundt2009-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing is using this, resulting in a build error with certain configurations. Just kill it off. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | | sh: Wire up HAVE_SYSCALL_TRACEPOINTS.Paul Mundt2009-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary to get ftrace syscall tracing working again.. a fairly trivial and mechanical change. The one benefit is that this can also be enabled on sh64, despite not having its own ftrace port. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | | Merge branch 'master' of ↵Paul Mundt2009-09-16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: arch/sh/kernel/vmlinux.lds.S
| * | | | | video: sh_mobile_lcdcfb: use both register sets for display panningPhil Edworthy2009-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using both register sets - side A and side B for display panning. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | | | video: sh_mobile_lcdcfb: implement display panningPhil Edworthy2009-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | | | sh: Fix up sh7705 flush_dcache_page() build.Paul Mundt2009-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type mismatch caused the page deref to blow up, fix it up as per the sh4 change. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | | | sh: kfr2r09: document the PLL/FLL <-> RF relationship.Kuninori Morimoto2009-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Early clock initialization sets up PLL/FLL values for optimal RF behaviour. As this relationship is presently undocumented, we document this in the script so the rationale is apparent. Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | | | sh: mach-ecovec24: need asm/clock.h.Kuninori Morimoto2009-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes up build failures. Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | | | sh: mach-ecovec24: deassert usb irq on boot.Kuninori Morimoto2009-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch prevents the USB1 interrupt from remaining asserted immediately after re-boot or during a jump in to a secondary kernel. Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | | | sh: Add KEYSC support for EcoVec24Kuninori Morimoto2009-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-16 22:19:45 -0500