summaryrefslogtreecommitdiff
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge Paulus' treeStephen Rothwell2005-11-0297-169/+243
|\
| * powerpc: include lmb.h in arch/powerpc/platforms/powermac/setup.cPaul Mackerras2005-11-021-0/+1
| | | | | | | | | | | | since it uses the lmb stuff in one place. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: Move naca.h to platforms/iseriesDavid Gibson2005-11-025-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These days, the NACA only exists on iSeries. Therefore, this patch moves naca.h from include/asm-ppc64 to arch/powerpc/platforms/iseries. There was one file including naca.h outside of platforms/iseries - arch/ppc64/kernel/udbg_scc.c. However, that's obviously a hangover from older days. The include is not necessary, so this patch simply removes it. Built and booted on iSeries, built for G5 (which uses udbg_scc.o). Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: Move dart.hDavid Gibson2005-11-022-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | asm-ppc64/dart.h is included in exactly one place - arch/powerpc/sysdev/u3_iommu.c. This patch, therefore, moves it into arch/powerpc/sysdev. While we're at it, update the #ifndef/#define protecting the include, and the filename in the comments of u3_iommu.c. Built and booted on pSeries and G5, built for ppc32 powermac. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * Merge ../linux-2.6Paul Mackerras2005-11-0289-163/+153
| |\
| | * Revert "i386: move apic init in init_IRQs"Linus Torvalds2005-10-315-97/+70
| | | | | | | | | | | | | | | | | | | | | | | | Commit f2b36db692b7ff6972320ad9839ae656a3b0ee3e causes a bootup hang on at least one machine. Revert for now until we understand why. The old code may be ugly, but it works. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * [PATCH] i386: CONFIG_PC removalArthur Othieno2005-10-311-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_PC is left-over cruft after the introduction of CONFIG_X86_PC with the subarch split. Remove it, and fixup the remaining users to depend on CONFIG_X86_PC instead. Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * Merge master.kernel.org:/home/rmk/linux-2.6-drvmodelLinus Torvalds2005-10-3183-61/+83
| | |\ | | | | | | | | | | | | Manual #include fixups for clashes - there may be some unnecessary
| | | * Create platform_device.h to contain all the platform device details.Russell King2005-10-2983-61/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert everyone who uses platform_bus_type to include linux/platform_device.h. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
* | | | Merge iSeries include file moveStephen Rothwell2005-11-0229-64/+64
|\ \ \ \ | |/ / / |/| | |
| * | | merge filename and modify references to iseries/vio.hKelly Daly2005-11-023-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iSeries/mf.hKelly Daly2005-11-024-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/lpar_map.hKelly Daly2005-11-025-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/it_lp_reg_save.hKelly Daly2005-11-021-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/it_lp_queue.hKelly Daly2005-11-028-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/it_lp_naca.hKelly Daly2005-11-023-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/it_exp_vpd_panel.hKelly Daly2005-11-023-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/hv_types.hKelly Daly2005-11-028-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/hv_lp_event.hKelly Daly2005-11-026-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify reference to iseries/hv_lp_config.hKelly Daly2005-11-026-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/hv_call_xm.hKelly Daly2005-11-027-7/+7
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/hv_call_sc.hKelly Daly2005-11-025-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/hv_call_event.hKelly Daly2005-11-022-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | merge filename and modify references to iseries/hv_call.hKelly Daly2005-11-013-3/+3
| |/ / | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
* | | powerpc: clean up bug.h furtherPaul Mackerras2005-11-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This simplifies the macros which are different between 32-bit and 64-bit. It also fixes a couple of printks on the bug->line element, which is now a long. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | powerpc: exclude powerbook sleep code with CONFIG_PPC64 and CONFIG_PMPaul Mackerras2005-11-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | We were getting powerbook sleep code included, and giving compile errors, with CONFIG_PM=y on a 64-bit build. This excludes that code so the kernel will compile. One day BenH will implement on sleep on the G5... Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | powerpc: Fix compile error with CONFIG_TAU=yPaul Mackerras2005-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | A couple of instances of "i" that needed to be changed to "cpu_id" got missed in the merge, because they were in CONFIG_TAU code. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | powerpc: Use rtas_call not call_rtas in CHRP codePaul Mackerras2005-11-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | The nvram driver imported from the ppc code uses call_rtas, but rtas_call is the name we are using in merged code (since ppc64 used that name, and it uses far more RTAS calls than ppc32). Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | powerpc: Fix pseries (64-bit) buildPaul Mackerras2005-11-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | A recent commit that removed rtas-fw.h and moved its contents to include/asm-powerpc/rtas.h forgot to also remove the inclusion of it in arch/powerpc/platforms/pseries/setup.c. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [PATCH] powerpc: Merge bitops.hDavid Gibson2005-11-016-188/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here's a revised version. This re-introduces the set_bits() function from ppc64, which I removed because I thought it was unused (it exists on no other arch). In fact it is used in the powermac interrupt code (but not on pSeries). - We use LARXL/STCXL macros to generate the right (32 or 64 bit) instructions, similar to LDL/STL from ppc_asm.h, used in fpu.S - ppc32 previously used a full "sync" barrier at the end of test_and_*_bit(), whereas ppc64 used an "isync". The merged version uses "isync", since I believe that's sufficient. - The ppc64 versions of then minix_*() bitmap functions have changed semantics. Previously on ppc64, these functions were big-endian (that is bit 0 was the LSB in the first 64-bit, big-endian word). On ppc32 (and x86, for that matter, they were little-endian. As far as I can tell, the big-endian usage was simply wrong - I guess no-one ever tried to use minixfs on ppc64. - On ppc32 find_next_bit() and find_next_zero_bit() are no longer inline (they were already out-of-line on ppc64). - For ppc64, sched_find_first_bit() has moved from mmu_context.h to the merged bitops. What it was doing in mmu_context.h in the first place, I have no idea. - The fls() function is now implemented using the cntlzw instruction on ppc64, instead of generic_fls(), as it already was on ppc32. - For ARCH=ppc, this patch requires adding arch/powerpc/lib to the arch/ppc/Makefile. This in turn requires some changes to arch/powerpc/lib/Makefile which didn't correctly handle ARCH=ppc. Built and running on G5. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [PATCH] powerpc: move arch/ppc64/kernel/bpa* to arch/powerpc/platforms/cellArnd Bergmann2005-11-018-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch simply moves files over to arch/powerpc without making any changes to them. Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [PATCH] powerpc: move mmio_nvram.c over to arch/powerpcArnd Bergmann2005-11-014-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nvram code formally known as bpa_nvram.c is rather generic really, so it is quite likely to be useful to future boards not based on cell. This patch puts it into arch/powerpc/sysdev. Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [PATCH] powerpc: move rtas_fw.c out of platforms/pseriesArnd Bergmann2005-11-015-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cell uses the same code as pSeries for flashing the firmware through rtas, so the implementation should not be part of platforms/pseries. Put it into arch/powerpc/kernel instead. Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [PATCH] powerpc: create a new arch/powerpc/platforms/cell/smp.cArnd Bergmann2005-11-013-0/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the conversion to the merge tree, the Cell specific SMP initialization was removed from the pSeries code. This creates a new Cell specific SMP implementation file. Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [PATCH] powerpc: Rename BPA to CellArnd Bergmann2005-11-0115-104/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | The official name for BPA is now CBEA (Cell Broadband Engine Architecture). This patch renames all occurences of the term BPA to 'Cell' for easier recognition. Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | powerpc: make mem= work on iSeries againStephen Rothwell2005-11-012-34/+25
| | | | | | | | | | | | | | | | | | | | | | | | By parsing the command line earlier, we can add the mem= value to the flattened device tree and let the generic code sort out the memory limit for us. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | | powerpc: fix __strnlen_user in merge treeStephen Rothwell2005-11-014-186/+1
|/ / | | | | | | | | | | | | | | Change USER/KERNEL_DS so that the merged version of __strnlen_user can be used which allows us to complete the removal of arch/ppc64/lib/. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | powerpc: import a fix from arch/ppc/mm/pgtable.cPaul Mackerras2005-10-311-3/+1
| | | | | | | | | | | | ... namely, the change to the 2-argument pte_alloc_kernel. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: apply recent changes to merged codePaul Mackerras2005-10-316-12/+6
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* | Merge ../linux-2.6 by handPaul Mackerras2005-10-31707-18067/+47666
|\ \
| * \ Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-10-3019-414/+395
| |\ \
| | * | [ARM] fix ixp2x00 defconfig NR_UARTS optionsDeepak Saxena2005-10-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IXDP2[48]00 have only 1 UART on the board. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] 3049/1: More optimized libgcc functionsNicolas Pitre2005-10-3011-312/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre This patch gets rid of the last C implementations of needed libgcc functions for the kernel, replacing them with optimized assembly versions. Those functions are: __ashldi3 __ashrdi3 __lshrdi3 __muldi3 __ucmpdi2 The first 3 were lifted from gcc, the other two were written from scratch. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] Clean up dmabounceRussell King2005-10-301-79/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Encapsulate pool data into dmabounce_pool. Only account successful allocations. Use dma_mapping_error(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] Make v6 copypage function static and cleanup pgprotsRussell King2005-10-301-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We know what pgprot we're going to use, so don't #define it. Also, since we select the nonaliasing/aliasing copypage implementation at run time, there's no point having it globally visible. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] Re-organise die()Russell King2005-10-301-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide __die() which can be called from various contexts to provide an oops report. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] 3069/1: Add spitz irda platform supportRichard Purdie2005-10-301-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Add spitz irda platform support Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] 3068/1: Add corgi irda platform supportRichard Purdie2005-10-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Add corgi irda platform support Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] 3067/1: Add poodle irda platform supportRichard Purdie2005-10-301-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Add poodle irda platform support Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [PATCH] fix missing includesTim Schmielau2005-10-3033-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I recently picked up my older work to remove unnecessary #includes of sched.h, starting from a patch by Dave Jones to not include sched.h from module.h. This reduces the number of indirect includes of sched.h by ~300. Another ~400 pointless direct includes can be removed after this disentangling (patch to follow later). However, quite a few indirect includes need to be fixed up for this. In order to feed the patches through -mm with as little disturbance as possible, I've split out the fixes I accumulated up to now (complete for i386 and x86_64, more archs to follow later) and post them before the real patch. This way this large part of the patch is kept simple with only adding #includes, and all hunks are independent of each other. So if any hunk rejects or gets in the way of other patches, just drop it. My scripts will pick it up again in the next round. Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
View Lorry Controller Status