aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* v4l: copy_to_user() is not a good method nameAl Viro2007-10-13
| | | | | | | | Breaks on any target that has copy_to_user() defined as a non-trivial macro. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* minimal build fixes for uml (fallout from x86 merge)Al Viro2007-10-13
| | | | | | | | | | | | | | | | | | | a) include/asm-um/arch can't just point to include/asm-$(SUBARCH) now b) arch/{i386,x86_64}/crypto are merged now c) subarch-obj needed changes d) cpufeature_64.h should pull "cpufeature_32.h", not <asm/cpufeature_32.h> since it can be included from asm-um/cpufeature.h e) in case of uml-i386 we need CONFIG_X86_32 for make and gcc, but not for Kconfig f) sysctl.c shouldn't do vdso_enabled for uml-i386 (actually, that one should be registered from corresponding arch/*/kernel/*, with ifdef going away; that's a separate patch, though). With that and with Stephen's patch ("[PATCH net-2.6] uml: hard_header fix") we have uml allmodconfig building both on i386 and amd64. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* net core: fix kernel-doc for new function parametersRandy Dunlap2007-10-13
| | | | | | | | | | | | | | | | | | | | | Fix networking code kernel-doc for newly added parameters. Warning(linux-2.6.23-git2//net/core/sock.c:879): No description found for parameter 'net' Warning(linux-2.6.23-git2//net/core/dev.c:570): No description found for parameter 'net' Warning(linux-2.6.23-git2//net/core/dev.c:594): No description found for parameter 'net' Warning(linux-2.6.23-git2//net/core/dev.c:617): No description found for parameter 'net' Warning(linux-2.6.23-git2//net/core/dev.c:641): No description found for parameter 'net' Warning(linux-2.6.23-git2//net/core/dev.c:667): No description found for parameter 'net' Warning(linux-2.6.23-git2//net/core/dev.c:722): No description found for parameter 'net' Warning(linux-2.6.23-git2//net/core/dev.c:959): No description found for parameter 'net' Warning(linux-2.6.23-git2//net/core/dev.c:1195): No description found for parameter 'dev' Warning(linux-2.6.23-git2//net/core/dev.c:2105): No description found for parameter 'n' Warning(linux-2.6.23-git2//net/core/dev.c:3272): No description found for parameter 'net' Warning(linux-2.6.23-git2//net/core/dev.c:3445): No description found for parameter 'net' Warning(linux-2.6.23-git2//include/linux/netdevice.h:1301): No description found for parameter 'cpu' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* docbook/mcabook: fixup x86 path/file namesRandy Dunlap2007-10-13
| | | | | | | | Fix docbook templates for new x86 path/filenames: docproc: linux-2.6.23-git2/include/asm-i386/mca_dma.h: No such file or directory Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* docbook/kernel-api: fixup x86 path/file namesRandy Dunlap2007-10-13
| | | | | | | Fix docbook templates for new x86 path/filenames. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* docbook/kernel-hacking: fixup x86 path/file namesRandy Dunlap2007-10-13
| | | | | | | Fix docbook templates for modified x86 path/filenames. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* docbook/deviceiobook: fixup x86 path/file namesRandy Dunlap2007-10-13
| | | | | | | | | Fix docbook templates for new x86 path/filenames: docproc: linux-2.6.23-git2/include/asm-i386/io.h: No such file or directory 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/lethal/sh64-2.6Linus Torvalds2007-10-13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh64-2.6: sh64: mach-cayman: Build fixes. sh64: Symbol export fixups. sh64: linker script tidying and alignment fixups. sh64: Set KBUILD_IMAGE to make the rpm target happy. sh64: Kill off obsolete linux/blk.h reference. sh64: cleanup struct irqaction initializers. sh64: Kill off dead gdb stub symbol. sh64: alphanumeric display only on Cayman. sh64: Add defconfigs for mach-sim and mach-harp. sh64: update cayman defconfig. sh64: Tidy up Kconfig dependencies. sh64: Move consistent DMA routines to arch/sh64/mm/. sh64: Some symbol exports and build fixes. sh64: mach-sim: Build fixes. sh64: mach-harp: Build fixes. sh64: Kill off duplicate frame pointer option. sh64: Kill off dead ROM-RAM and generic boards. sh64: Tidy up includes for Cayman board. sh64: Move *_p() I/O routine variants to io.h.
| * sh64: mach-cayman: Build fixes.Paul Mundt2007-10-09
| | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Symbol export fixups.Paul Mundt2007-10-09
| | | | | | | | | | | | | | | | | | Kill off the __div_table reference, modern compilers don't have it, and old compilers can't build the sh64 kernel anyways. __copy_user also needs to be exported to satisfy module builds. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: linker script tidying and alignment fixups.Paul Mundt2007-10-09
| | | | | | | | | | | | | | Use more of the generic section helpers, and get the alignment for some of the sections reduced. Follows the sh change. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Set KBUILD_IMAGE to make the rpm target happy.Paul Mundt2007-10-09
| | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Kill off obsolete linux/blk.h reference.Paul Mundt2007-10-09
| | | | | | | | | | | | | | This is just dead code, kill it off.. Reported-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: cleanup struct irqaction initializers.Thomas Gleixner2007-10-03
| | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Kill off dead gdb stub symbol.Paul Mundt2007-10-01
| | | | | | | | | | | | | | There's no supported GDB stub in the kernel, kill off the dead config option for it. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: alphanumeric display only on Cayman.Paul Mundt2007-10-01
| | | | | | | | | | | | | | Dependency cleanup. The non-cayman boards don't have the mach callbacks for this and build error badness ensues. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Add defconfigs for mach-sim and mach-harp.Paul Mundt2007-10-01
| | | | | | | | | | | | defconfigs for the simulator and ST50-HARP. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: update cayman defconfig.Paul Mundt2007-10-01
| | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Tidy up Kconfig dependencies.Paul Mundt2007-10-01
| | | | | | | | | | | | | | | | Now that the ROM-RAM and generic boards are killed off, refactor the dependencies accordingly. Those were the only special cases, so all of the Kconfig dependency hell gets much cleaner as a result. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Move consistent DMA routines to arch/sh64/mm/.Paul Mundt2007-10-01
| | | | | | | | | | | | | | | | | | | | | | | | The consistent DMA stuff was evolved from the old PCI DMA mapping functions. As this has been overhauled, it's something that is used by the generic DMA mapping code, and thus, has no intrinsic PCI dependence. Move the routines somewhere more sensible (same place as sh), and fix up the build for CONFIG_PCI=n in the process. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Some symbol exports and build fixes.Paul Mundt2007-10-01
| | | | | | | | | | | | | | | | This fixes up misc build issues that were hit on the non-cayman boards. Additionally, quite a few symbols needed to be exported to fix the module build. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: mach-sim: Build fixes.Paul Mundt2007-10-01
| | | | | | | | | | | | Follow the mach-harp changes to get the simulator support building. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: mach-harp: Build fixes.Paul Mundt2007-10-01
| | | | | | | | | | | | Get the ST50-HARP building again. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Kill off duplicate frame pointer option.Paul Mundt2007-10-01
| | | | | | | | | | | | | | This is already enabled through lib/Kconfig.debug, kill off the architecture specific one. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Kill off dead ROM-RAM and generic boards.Paul Mundt2007-10-01
| | | | | | | | | | | | | | | | The generic board stubs were never added, and the ROM-RAM boards never made it in to the wild. Neither one has any users, and both are utterly broken in-tree (likely since 2.4). Kill them both off. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Tidy up includes for Cayman board.Paul Mundt2007-10-01
| | | | | | | | | | | | | | There were quite a few left over includes from code that was removed long ago, rip out the stuff we no longer need. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh64: Move *_p() I/O routine variants to io.h.Paul Mundt2007-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were implemented using an ugly macro for just simple wrapping, so we just make the wrapping explicit and move it to io.h instead. Also fixes up some modules: CC [M] drivers/net/8390.o In file included from drivers/net/8390.c:6: drivers/net/lib8390.c: In function 'ei_start_xmit': drivers/net/lib8390.c:329: error: implicit declaration of function 'outb_p' drivers/net/lib8390.c: In function '__ei_interrupt': drivers/net/lib8390.c:457: error: implicit declaration of function 'inb_p' make[2]: *** [drivers/net/8390.o] Error 1 make[1]: *** [drivers/net] Error 2 Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2007-10-13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (124 commits) sh: allow building for both r2d boards in same binary. sh: fix r2d board detection sh: Discard .exit.text/.exit.data at runtime. sh: Fix up some section alignments in linker script. sh: Fix SH-4 DMAC CHCR masking. sh: Rip out left-over nommu cond syscall cruft. sh: Make kgdb i-cache flushing less inept. sh: kgdb section mismatches and tidying. sh: cleanup struct irqaction initializers. sh: early_printk tidying. video: pvr2fb: Add TV (RGB) support to Dreamcast PVR driver. sh: Conditionalize gUSA support. sh: Follow gUSA preempt changes in __switch_to(). sh: Tidy up gUSA preempt handling. sh: __copy_user() optimizations for small copies. sh: clkfwk: Support multi-level clock propagation. sh: Fix URAM start address on SH7785. sh: Use boot_cpu_data for CPU probe. sh: Support extended mode TLB on SH-X3. sh: Bump MAX_ACTIVE_REGIONS for SH7785. ...
| * | sh: allow building for both r2d boards in same binary.Magnus Damm2007-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables building for both R2D-PLUS and R2D-1 boards. All code is already in place except for the Kconfig limitation. This is useful if you want to run the same binary on both R2D-PLUS and R2D-1 boards. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: fix r2d board detectionMagnus Damm2007-10-10
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the R2D-PLUS and R2D-1 board detection code. Tested on two R2D-PLUS and two R2D-1 boards. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Discard .exit.text/.exit.data at runtime.Paul Mundt2007-10-09
| | | | | | | | | | | | | | | | | | | | | These were previously discarded at link time, though as with MIPS we keep them around until runtime to satisfy .rodata references. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fix up some section alignments in linker script.Paul Mundt2007-10-09
| | | | | | | | | | | | | | | | | | | | | | | | With the PERCPU() macro introduction .data.cacheline_aligned was inhereting PAGE_SIZE alignment, fix that up for L1_CACHE_BYTES again. Likewise, the initramfs section wants PAGE_SIZE alignment. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fix SH-4 DMAC CHCR masking.Adrian McMenamin2007-10-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the DMA cascade by masking the correct bits. Tested and working with Dreamcast PVR2 DMA. With this patch applied the existing mainline code in arch/sh/drivers/dma/dma-sh.c works, whereas before I was patching that to get round this problem. Signed-off-by: Adrian McMenamin <adrian@mcmen.demon.co.uk> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Rip out left-over nommu cond syscall cruft.Paul Mundt2007-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | At some point way back when (2.5 or so) quite a few syscalls hadn't yet been wired up as cond_syscalls(), so we opted to just do direct sys_ni_syscall wrapping in the assembly code instead. That's all been fixed up since then, so we can drop the wrapping. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Make kgdb i-cache flushing less inept.Paul Mundt2007-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kgdb had its own ranged I-cache flushing routine that attempted to duplicate the flush_icache_range() functionality, but managed to do an explicit D-cache writeback & invalidate twice on SH-4. This is a no-op for SH-3, and the flush_icache_range() semantics already do what kgdb was feebly attempting to do already, so just move over to that and kill off the wrapper. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: kgdb section mismatches and tidying.Paul Mundt2007-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | The kgdb console setup was callable from a left-over deferred initialization path, which in turn depends on __init symbols. Since the deferred initialization was removed some time ago, kill off the rest of those remnants and move kgdb_init() and friends to __init. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: cleanup struct irqaction initializers.Thomas Gleixner2007-10-03
| | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: early_printk tidying.Paul Mundt2007-10-02
| | | | | | | | | | | | | | | | | | | | | | | | setup_early_printk() can be static, and with that, we can kill off the early initialization variable and move the CON_BOOT check in to the function body. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | video: pvr2fb: Add TV (RGB) support to Dreamcast PVR driver.Adrian McMenamin2007-09-30
| | | | | | | | | | | | | | | | | | | | | Add support for RGB output to the Dreamcast PVR2 frame buffer driver. Signed-off-by: Adrian McMenamin <adrian@mcmen.demon.co.uk> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Conditionalize gUSA support.Paul Mundt2007-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This conditionalizes gUSA support. gUSA is not supported on SMP configurations, and it's not necessary there anyways due to having other atomicity options (ie, movli.l/movco.l). Anything implementing the LL/SC semantics (all SH-4A CPUs) can switch to userspace atomicity implementations without requiring gUSA. This is left default-enabled on all UP so that glibc doesn't break. Those that know what they are doing can disable this explicitly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Follow gUSA preempt changes in __switch_to().Paul Mundt2007-09-28
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Tidy up gUSA preempt handling.Paul Mundt2007-09-28
| | | | | | | | | | | | | | | | | | | | | | | | Currently gUSA toggles hardirqs to disable preemption in the signal handler. Make the preemption toggling explicit, and kill off some CONFIG_PREEMPT ifdefs in the process. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: __copy_user() optimizations for small copies.Stuart Menefy2007-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | This implements a fast-path for small (less than 12 bytes) copies, with the existing path treated as the slow-path and left as the default behaviour for all other copy sizes. Signed-off-by: Stuart Menefy <stuart.menefy@st.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: clkfwk: Support multi-level clock propagation.Stuart Menefy2007-09-27
| | | | | | | | | | | | | | | | | | | | | | | | Currently clock propagation only works for one level, but we have some clocks which need to propagate multiple levels, so make this recursive. Signed-off-by: Stuart Menefy <stuart.menefy@st.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fix URAM start address on SH7785.Paul Mundt2007-09-27
| | | | | | | | | | | | | | | | | | | | | | | | Not all of the SH-X2 URAM blocks are mapped in the same place, SH7785 happens to map it on the opposite end of the address space from SH7722, correct the addresses. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Use boot_cpu_data for CPU probe.Paul Mundt2007-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves off of smp_processor_id() and only sets the probe information for the boot CPU directly. This will be copied out for the secondaries, so there's no reason to do this each time. This also allows for some header tidying. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Support extended mode TLB on SH-X3.Paul Mundt2007-09-27
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Bump MAX_ACTIVE_REGIONS for SH7785.Paul Mundt2007-09-27
| | | | | | | | | | | | | | | | | | | | | | | | When using URAM in NUMA mode another active region is needed. Bump this up so we don't trigger the region truncation in add_active_range(). Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fix plat_irq_setup_pins() for SH7785.Paul Mundt2007-09-27
| | | | | | | | | | | | | | | | | | | | | There was some debug code left in here that caused the pin changes to never be hit. Kill that off, and all is well. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Kill off duplicate NODES_SHIFT.Paul Mundt2007-09-27
| | | | | | | | | | | | | | | | | | | | | We already set this in arch/sh/mm/Kconfig, don't set a conflicting one in arch/sh/Kconfig too.. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-17 02:38:43 -0500