aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/include
AgeCommit message (Collapse)AuthorFilesLines
2009-07-02sh: Fix compiler error and include the definition of IS_ERR_VALUEMatt Fleming1-0/+1
When arch/sh/include/asm/syscall_32.h is included from a file that doesn't also include linux/err.h the following error is produced, In file included from /home/matt/src/kernels/sh-2.6/arch/sh/include/asm/syscall.h:5, from kernel/trace/trace_syscalls.c:3: /home/matt/src/kernels/sh-2.6/arch/sh/include/asm/syscall_32.h: In function 'syscall_get_error': /home/matt/src/kernels/sh-2.6/arch/sh/include/asm/syscall_32.h:28: error: implicit declaration of function 'IS_ERR_VALUE' make[2]: *** [kernel/trace/trace_syscalls.o] Error 1 make[1]: *** [kernel/trace] Error 2 make: *** [kernel] Error 2 Signed-off-by: Matt Fleming <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-26sh: ms7724se: Add sh_eth supportKuninori Morimoto1-0/+5
Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-24sh: make set_perf_counter_pending() static inline.Paul Mundt1-1/+1
Fixes up a recently introduced build error. Reported-by: Kyle McMartin <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-23sh: Fix up more dma-mapping fallout.Paul Mundt1-6/+6
commit dbe6f1869188b6e04e38aa861dd198befb08bcd7 ("dma-mapping: mark dma_sync_single and dma_sync_sg as deprecated" conveniently broke every single SH build. In the future it would be great if people could at least bother figuring out how to use grep. Signed-off-by: Paul Mundt <[email protected]>
2009-06-23sh: Provide cpu_idle_wait() to fix up cpuidle/SMP build.Paul Mundt1-0/+1
Crib the x86 cpu_idle_wait() implementation and shove it in with the idle code, subsequently enabling ARCH_HAS_CPU_IDLE_WAIT. Signed-off-by: Paul Mundt <[email protected]>
2009-06-18Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds36-1129/+98
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (56 commits) sh: Fix declaration of __kernel_sigreturn and __kernel_rt_sigreturn sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs. sh: remove stray markers. sh: defconfig updates. sh: pci: Initial PCI-Express support for SH7786 Urquell board. sh: Generic HAVE_PERF_COUNTER support. SH: convert migor to soc-camera as platform-device SH: convert ap325rxa to soc-camera as platform-device soc-camera: unify i2c camera device platform data sh: add platform data for r8a66597-hcd in setup-sh7723 sh: add platform data for r8a66597-hcd in setup-sh7366 sh: x3proto: add platform data for r8a66597-hcd sh: highlander: add platform data for r8a66597-hcd sh: sh7785lcr: add platform data for r8a66597-hcd sh: turn off irqs when disabling CMT/TMU timers sh: use kzalloc() for cpg clocks sh: unbreak WARN_ON() sh: Use generic atomic64_t implementation. sh: Revised clock function in highlander sh: Update r7780mp defconfig ...
2009-06-17Delete pcibios_select_rootMatthew Wilcox1-13/+0
This function was only used by pci_claim_resource(), and the last commit deleted that use. Signed-off-by: Matthew Wilcox <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2009-06-17Merge branches 'sh/pci-express-integration', 'sh/rsk-updates', ↵Paul Mundt3-21/+12
'sh/platform-updates' and 'sh/perf_counter'
2009-06-17sh: Generic HAVE_PERF_COUNTER support.Paul Mundt1-0/+7
This enables support for the generic software-based perf counters. Hardware counter support could be added in the future, but the lack of a performance counter IRQ makes this rather dubious. Signed-off-by: Paul Mundt <[email protected]>
2009-06-16kmap_types: make most arches use generic header fileRandy Dunlap1-21/+3
Convert most arches to use asm-generic/kmap_types.h. Move the KM_FENCE_ macro additions into asm-generic/kmap_types.h, controlled by __WITH_KM_FENCE from each arch's kmap_types.h file. Would be nice to be able to add custom KM_types per arch, but I don't yet see a nice, clean way to do that. Built on x86_64, i386, mips, sparc, alpha(tonyb), powerpc(tonyb), and 68k(tonyb). Note: avr32 should be able to remove KM_PTE2 (since it's not used) and then just use the generic kmap_types.h file. Get avr32 maintainer approval. Signed-off-by: Randy Dunlap <[email protected]> Cc: <[email protected]> Acked-by: Mike Frysinger <[email protected]> Cc: Richard Henderson <[email protected]> Cc: Ivan Kokshaysky <[email protected]> Cc: Bryan Wu <[email protected]> Cc: Mikael Starvik <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: "Luck Tony" <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: David Howells <[email protected]> Cc: Kyle McMartin <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Paul Mundt <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2009-06-17sh: Use generic atomic64_t implementation.Paul Mundt1-0/+2
Signed-off-by: Paul Mundt <[email protected]>
2009-06-16sh: Add support mtd mapping for highlanderNobuhiro Iwamatsu1-0/+3
Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-15sh: Make the atomic functions safe for irqsoff tracingMatt Fleming1-12/+12
The irqsoff tracer uses the atomic_* functions internally, but the implementations of those functions in arch/sh/include/asm/atomic-irq.h disable irqs to achieve atomicity. A continuous loop ensues where we disable interrupts, trace the interrupt disabling, call atomic_* functions, disable interrupts, trace the interrupt disabling, etc.. The simplest solution to all this is to just convert uses of local_irq_save()/local_irq_restore() the raw_* equivalents because the raw_* equivalents don't call trace_hardirqs_on()/trace_hardirqs_off(). Signed-off-by: Matt Fleming <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-15sh: Convert sh64 to use the generic checksum code.Paul Mundt2-79/+1
This plugs in GENERIC_CSUM support on sh64, and kills off all of the old references. Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Derive COMMAND_LINE_SIZE from asm-generic/setup.h.Paul Mundt1-1/+1
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Switch to asm-generic versions for identical headers.Paul Mundt6-146/+6
This switches over mman/param/parport/serial/socket/ucontext.h. Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Convert to asm-generic/signal.h.Paul Mundt1-146/+1
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Convert to asm-generic/types.h.Paul Mundt1-15/+1
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Convert to asm-generic/scatterlist.h.Paul Mundt1-22/+2
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Convert to asm-generic/unaligned.h.Paul Mundt1-13/+1
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Convert to asm-generic/module.h.Paul Mundt1-11/+1
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Conver to asm-generic/mmu_context.h.Paul Mundt1-9/+9
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Tidy up duplication in irq/swab/timex.h.Paul Mundt3-9/+3
The asm-generic versions have some helper definitions that we can use instead, drop our definitions and use those instead. Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Convert ipc/shm bits to their asm-generic versions.Paul Mundt4-127/+4
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Convert to asm-generic/termbits.h and termios.h.Paul Mundt2-288/+2
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Convert to asm-generic/posix_types.h.Paul Mundt2-214/+32
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Convert to asm-generic/dma.h.Paul Mundt1-9/+1
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14sh: Convert to asm-generic/current.h.Paul Mundt1-20/+1
Signed-off-by: Paul Mundt <[email protected]>
2009-06-14Merge branch 'master' of ↵Paul Mundt5-4/+5
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-14cpumask: use mm_cpumask() wrapper: shRusty Russell1-2/+2
Makes code futureproof against the impending change to mm->cpu_vm_mask. It's also a chance to use the new cpumask_ ops which take a pointer (the older ones are deprecated, but there's no hurry for arch code). Signed-off-by: Rusty Russell <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-14cpumask: arch_send_call_function_ipi_mask: shRusty Russell1-1/+2
We're weaning the core code off handing cpumask's around on-stack. This introduces arch_send_call_function_ipi_mask(), and by defining it, the old arch_send_call_function_ipi is defined by the core code. Signed-off-by: Rusty Russell <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-14cpumask: remove the now-obsoleted pcibus_to_cpumask(): shRusty Russell1-3/+0
cpumask_of_pcibus() is the new version. Signed-off-by: Rusty Russell <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-12asm-generic: merge branch 'master' of torvalds/linux-2.6Arnd Bergmann38-362/+796
Fixes a merge conflict against the x86 tree caused by a fix to atomic.h which I renamed to atomic_long.h. Signed-off-by: Arnd Bergmann <[email protected]>
2009-06-12sh: Wire up sys_perf_counter_open.Paul Mundt2-2/+4
Signed-off-by: Paul Mundt <[email protected]>
2009-06-11asm-generic: rename page.h and uaccess.hArnd Bergmann1-1/+1
The current asm-generic/page.h only contains the get_order function, and asm-generic/uaccess.h only implements unaligned accesses. This renames the file to getorder.h and uaccess-unaligned.h to make room for new page.h and uaccess.h file that will be usable by all simple (e.g. nommu) architectures. Signed-off-by: Remis Lima Baima <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2009-06-11asm-generic: rename atomic.h to atomic-long.hArnd Bergmann1-1/+1
The existing asm-generic/atomic.h only defines the atomic_long type. This renames it to atomic-long.h so we have a place to add a truly generic atomic.h that can be used on all non-SMP systems. Signed-off-by: Remis Lima Baima <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Ingo Molnar <[email protected]>
2009-06-11asm-generic: introduce asm/bitsperlong.hArnd Bergmann1-0/+1
This provides a reliable way for asm-generic/types.h and other files to find out if it is running on a 32 or 64 bit platform. We cannot use CONFIG_64BIT for this in headers that are included from user space because CONFIG symbols are not available there. We also cannot do it inside of asm/types.h because some headers need the word size but cannot include types.h. The solution is to introduce a new header <asm/bitsperlong.h> that defines both __BITS_PER_LONG for user space and BITS_PER_LONG for usage in the kernel. The asm-generic version falls back to 32 bit unless the architecture overrides it, which I did for all 64 bit platforms. Signed-off-by: Remis Lima Baima <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2009-06-11asm-generic: rename termios.h, signal.h and mman.hArnd Bergmann2-2/+2
The existing asm-generic versions are incomplete and included by some architectures. New architectures should be able to use a generic version, so rename the existing files and change all users, which lets us add the new files. Signed-off-by: Remis Lima Baima <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2009-06-11sh: Wire up sys_rt_tgsigqueueinfo.Paul Mundt2-2/+4
Signed-off-by: Paul Mundt <[email protected]>
2009-06-11sh: Fix sh4a llsc-based cmpxchg()Aoi Shinkai4-4/+31
This fixes up a typo in the ll/sc based cmpxchg code which apparently wasn't getting a lot of testing due to the swapped old/new pair. With that fixed up, the ll/sc code also starts using it and provides its own atomic_add_unless(). Signed-off-by: Aoi Shinkai <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-11sh: add enable()/disable()/set_rate() to div6 codeMagnus Damm1-0/+4
This patch updates the div6 clock helper code to add support for enable(), disable() and set_rate() callbacks. Needed by the camera clock enabling board code on Migo-R. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-11sh: sh7722 mode pin definitionsMagnus Damm1-0/+14
This patch adds sh7722 mode pin and pin function controller comments. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-11sh: sh7724 mode pin commentsMagnus Damm1-0/+14
This patch adds comments for the sh7724 mode pins and pin function controller. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-11sh: sh7723 mode pin V2Magnus Damm1-0/+14
This patch is sh7723 mode pin V2. Mode pins and pin function controller comments are added. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-11sh: rework mode pin codeMagnus Damm2-19/+37
This patch reworks the mode pin code to keep the pin definitions in one place. The mode pins values are now the value of the bit instead of bit number. With this patch in place the sh7785 header file contains mode pin comments. The sh7785 clock code and the sh7785lcr board code are updated to reflect the new shared mode pins. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-11sh: clock div6 helper codeMagnus Damm1-0/+10
This patch adds div6 clock helper code. The div6 clocks are simply 6-bit divide-by-n modules where n is 1 to 64. Needed for vclk on sh7722, sh7723, sh7343 and sh7366. sh7724 needs this even more for vclk, fclka, fclkb, irdaclk and spuclk. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-11Merge branch 'master' of ↵Paul Mundt1-1/+0
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-04sh: 16-bit get_unaligned() sh4a fixMagnus Damm1-5/+5
This patch fixes the 16-bit case of the sh4a specific unaligned access implementation. Without this patch the 16-bit version of sh4a get_unaligned() results in a 32-bit read which may read more data than intended and/or cross page boundaries. Unbreaks mtd NOR write handling on Migo-R. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-02sh: add RAMCR definition for sh4Kuninori Morimoto1-0/+2
Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2009-06-01sh: shared div4 clock codeMagnus Damm1-0/+15
Add shared code for 4-bit divisor clocks. Processor specific code can use SH_CLK_DIV4() to initialize div4 clocks, and then use sh_clk_div4_register() for registration. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Paul Mundt <[email protected]>