summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ARM] integrator: parenthesize __virt_to_bus/__bus_to_virt argumentRussell King2008-11-301-2/+2
| | | | | | | Macro arguments should be parenthesized to avoid unexpected side effects. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] pnx4008: fix definition of PHYS_OFFSETRussell King2008-11-301-1/+1
| | | | | | PHYS_OFFSET constants should be defined using UL(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into develRussell King2008-11-2939-41/+41
|\
| * Merge branch 'master' of ↵Ben Dooks2008-11-03846-7700/+5663
| |\ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
| * | [ARM] S3C24XX: Move mci.h to arch/arm/plat-s3c24xx/include/platBen Dooks2008-10-302-1/+1
| | | | | | | | | | | | | | | | | | | | | Move mci.h to new position in arch/arm/plat-s3c24xx/include/plat ready to clean out old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Move plat/regs-spi.h to arch/arm/plat-s3c/include/plat.Ben Dooks2008-10-308-7/+7
| | | | | | | | | | | | | | | | | | | | | Move plat/regs-spi.h to arch/arm/plat-s3c/include/plat ready ready to clean out old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C24XX: Movev udc headers to arch/arm/plat-s3c24xx/include/platBen Dooks2008-10-309-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Move the udc headers to the proper home in arch/arm/plat-s3c24xx/include/plat ready to clean out the old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Move regs-ac97.h to arch/arm/plat-s3c/include/plat.Ben Dooks2008-10-306-5/+5
| | | | | | | | | | | | | | | | | | | | | Move regs-ac97.h to arch/arm/plat-s3c/include/plat ready to clean out old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Move nand headers to arch/arm/plat-s3c/include/platBen Dooks2008-10-3012-11/+11
| | | | | | | | | | | | | | | | | | | | | Move nand headers to arch/arm/plat-s3c/include/plat ready to clean out the old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Move regs-rtc.h to arch/arm/plat-s3c/include/platBen Dooks2008-10-302-1/+1
| | | | | | | | | | | | | | | | | | | | | Move regs-rtc.h to arch/arm/plat-s3c/include/plat ready to clean out old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Move i2c headers to arch/arm/plat-s3c/include/plat.Ben Dooks2008-10-306-5/+5
| | | | | | | | | | | | | | | | | | | | | Move the i2c headers to arch/arm/plat-s3c/include/plat ready to clean out the old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Move regs-watchdog.h to arch/arm/plat-s3c/include/platBen Dooks2008-10-304-3/+3
| | | | | | | | | | | | | | | | | | | | | Move regs-watchdog.h to arch/arm/plat-s3c/include/plat ready to clean out the old include directories Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | [ARM] give RiscPC a NR_IRQS definition and remove defaultRussell King2008-11-292-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | RiscPC is the only platform using the default setting for NR_IRQS, so the default NR_IRQS doesn't really make sense; remove it and make RiscPC provide such a definition. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] Remove linux/sched.h from asm/cacheflush.h and asm/uaccess.hRussell King2008-11-296-2/+6
| | | | | | | | | | | | | | | | | | | | | ... and fix those drivers that were incorrectly relying upon that include. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] Rename ISA mach/dma.h header to mach/isa-dma.hRussell King2008-11-295-5/+5
| | | | | | | | | | | | | | | | | | | | | This avoids confusion with platform specific DMA implementations in mach/dma.h Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] Hide ISA DMA API when ISA_DMA_API is unsetRussell King2008-11-2949-311/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ISA_DMA_API is unset, we're not implementing the ISA DMA API, so there's no point in publishing the prototypes via asm/dma.h, nor including the machine dependent parts of that API. This allows us to remove a lot of mach/dma.h files which don't contain any useful code. Unfortunately though, some platforms put their own private non-ISA definitions into mach/dma.h, so we leave these behind and fix the appropriate #include statments. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] fix constant values of MAX_DMA_ADDRESSRussell King2008-11-293-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since 8d5796d2ec6b5a4e7a52861144e63af438d6f8f7, we have allowed PAGE_OFFSET to be configurable, so a constant virtual address for MAX_DMA_ADDRESS is buggy. It should be defined in terms of PAGE_OFFSET rather than a constant virtual address. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] move MAX_DMA_ADDRESS to mach/memory.hRussell King2008-11-2914-44/+20
| | | | | | | | | | | | | | | | | | | | | Move the definition of MAX_DMA_ADDRESS from mach/dma.h to mach/memory.h, thereby placing it along side its relative, ISA_DMA_THRESHOLD. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] Remove unnecessary mach/hardware.h includes in arch/arm/mmRussell King2008-11-283-3/+0
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] asm/system.h does not require asm/memory.hRussell King2008-11-281-2/+0
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] ns9xxx: mach/hardware.h doesn't need asm/memory.hRussell King2008-11-281-2/+0
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] ixp4xx: clean up includesRussell King2008-11-282-5/+1
| | | | | | | | | | | | | | | | | | | | | mach/io.h doesn't need linux/mm.h. mach/dma.h doesn't need linux/device.h, asm/page.h or mach/hardware.h Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] ixp23xx: mach/io.h doesn't need BUG() anymoreRussell King2008-11-281-2/+0
| | | | | | | | | | | | | | | | | | | | | ixp23xx's mach/io.h claims to need linux/kernel.h for BUG(). However, this header doesn't make use of BUG(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] iop13xx: avoid polluting the kernel's namespaceRussell King2008-11-281-2/+0
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/timex.h. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] iop3xx: avoid polluting the kernel's namespaceRussell King2008-11-287-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h, mach/memory.h and mach/timex.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] shark: avoid polluting the kernel's namespaceRussell King2008-11-283-25/+6
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] shark: remove old unused "translated" IO macrosRussell King2008-11-281-17/+0
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] clps711x: avoid polluting the kernel's namespaceRussell King2008-11-281-2/+0
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] footbridge: mach/hardware.h doesn't require mach/memory.hRussell King2008-11-281-2/+0
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] footbridge: avoid polluting the kernel's namespaceRussell King2008-11-282-4/+2
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] aaec2000: avoid polluting the kernel's namespaceRussell King2008-11-281-2/+0
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] lh7a40x: avoid polluting the kernel's namespaceRussell King2008-11-282-3/+2
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] l7200: avoid polluting the kernel's namespaceRussell King2008-11-281-2/+0
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] h720x: avoid polluting the kernel's namespaceRussell King2008-11-281-2/+0
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] imx: avoid polluting the kernel's namespaceRussell King2008-11-281-2/+0
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h in mach/io.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] pxa: avoid polluting the kernel's namespaceRussell King2008-11-287-3/+8
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessarily pollution of the kernel's namespace by avoiding mach/hardware.h. Include this header file where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] rpc: remove obsolete IO accessorsRussell King2008-11-281-46/+1
| | | | | | | | | | | | | | | | | | | | | Remove __arch_base_xxx() and __ioaddrc() macros; they're obsolete and unused. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] versatile: remove IRQ mask definitionsRussell King2008-11-282-144/+0
| | | | | | | | | | | | | | | | | | These definitions are unused and serve no purpose with genirq. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'highmem' into develRussell King2008-11-2868-1254/+771
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-clps7500/include/mach/memory.h
| * | | [ARM] remove a common set of __virt_to_bus definitionsNicolas Pitre2008-11-2839-299/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's provide an overridable default instead of having every machine class define __virt_to_bus and __bus_to_virt to the same thing. What most platforms are using is bus_addr == phys_addr so such is the default. One exception is ebsa110 which has no DMA what so ever, so the actual definition is not important except only for proper compilation. Also added a comment about the special footbridge bus translation. Let's also remove comments alluding to set_dma_addr which is not (and should not) be commonly used. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] unconditionally define __virt_to_phys and __phys_to_virtNicolas Pitre2008-11-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no machine class overriding this. If non linear translations are implemented again for some machines then this could be restored at that time. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] remove bogus #ifdef CONFIG_HIGHMEM in show_pte()Nicolas Pitre2008-11-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The restriction on !CONFIG_HIGHMEM is unneeded since page tables are currently never allocated with highmem pages, and actually disable PTE dump whenever highmem is configured. Let's have a dynamic test to better describe the current limitation instead. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] prevent the vmalloc cmdline argument from eating all memoryNicolas Pitre2008-11-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 8d5796d2ec6b5a4e7a52861144e63af438d6f8f7 allows for the vmalloc area to be resized from the kernel cmdline. Make sure it cannot overlap with RAM entirely. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] mem_init() cleanupsNicolas Pitre2008-11-281-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make free_area() arguments pfn based, and return number of freed pages. This will simplify highmem initialization later. Also, codepages, datapages and initpages are actually codesize, datasize and initsize. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] split highmem into its own memory bankNicolas Pitre2008-11-281-33/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing so will greatly simplify the bootmem initialization code as each bank is therefore entirely lowmem or highmem with no crossing between those zones. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] rationalize memory configuration code some moreNicolas Pitre2008-11-286-59/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there are two instances of struct meminfo: one in kernel/setup.c marked __initdata, and another in mm/init.c with permanent storage. Let's keep only the later to directly populate the permanent version from arm_add_memory(). Also move common validation tests between the MMU and non-MMU cases into arm_add_memory() to remove some duplication. Protection against overflowing the membank array is also moved in there in order to cover the kernel cmdline parsing path as well. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] fix a couple clear_user_highpage assembly constraintsNicolas Pitre2008-11-287-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In all cases the kaddr is assigned an input register even though it is modified in the assembly code. Let's assign a new variable to the modified value and mark those inline asm with volatile otherwise they get optimized away because the output variable is otherwise not used. Also fix a few conversion errors in copypage-feroceon.c and copypage-v4mc.c. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] clearpage: provide our own clear_user_highpage()Russell King2008-11-2710-100/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For similar reasons as copy_user_page(), we want to avoid the additional kmap_atomic if it's unnecessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] copypage: provide our own copy_user_highpage()Russell King2008-11-2710-83/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to override the copy_user_page() function. However, this is not only inefficient, it also causes additional complexity for highmem support, since we convert from a struct page to a kernel direct mapped address and back to a struct page again. Moreover, with highmem support, we end up pointlessly setting up kmap entries for pages which we're going to remap. So, push the kmapping down into the copypage implementation files where it's required. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] copypage: convert assembly files to CRussell King2008-11-2710-411/+431
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
OpenPOWER on IntegriCloud