aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | powerpc: Merge asm-ppc/kexec.h and asm-ppc64/kexec.hMichael Ellerman2005-11-034-82/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge include/asm-ppc/kexec.h and include/asm-ppc64/kexec.h. The only thing that's really changed is that we now allocate crash_notes properly on PPC32. It's address is exported via sysfs, so it's not correct for it to be a pointer. I've also removed some of the "we don't use this" comments, because they're wrong (or perhaps were referring only to arch code). Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| | | * | | powerpc: Move plpar_wrappers.h into arch/powerpc/platforms/pseriesMichael Ellerman2005-11-036-124/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move plpar_wrappers.h into arch/powerpc/platforms/pseries, fixup white space, and update callers. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| | | * | | powerpc: Make set_dabr() a ppc_md functionMichael Ellerman2005-11-033-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pSeries specific code in set_dabr() into a ppc_md function, this will allow us to keep plpar_wrappers.h private to platforms/pseries. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| | | * | | powerpc: Copy default configs into arch/powerpc/configsMichael Ellerman2005-11-035-0/+5847
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy default configs into arch/powerpc/configs, rename bpa_defconfig to cell_defconfig while we're at it. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| | * | | | powerpc: Merge smp-tbsync.c (the generic timebase sync routine)Paul Mackerras2005-11-045-65/+65
| | | |/ / | | |/| | | | | | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | Merge git://oak/home/sfr/kernels/iseries/workPaul Mackerras2005-11-0315-420/+251
| | |\ \ \
| | | * | | powerpc: merge ucontext.hStephen Rothwell2005-11-033-49/+40
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| | | * | | powerpc: merge sigcontext.hStephen Rothwell2005-11-032-33/+23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| | | * | | powerpc: move include/asm-ppc64/ppc32.h to arch/powerpc/kernelStephen Rothwell2005-11-032-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is only included by signal_32.c Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| | | * | | powerpc: move ppc64/kernel/signal.c to arch/powerpcStephen Rothwell2005-11-033-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| | | * | | powerpc: merge ptrace.hStephen Rothwell2005-11-033-206/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move struct ptregs32 into asm-ppc64/ppc32.h Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| | | * | | powerpc: merge stat.hStephen Rothwell2005-11-033-129/+81
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| | * | | | [PATCH] powerpc: Keep fixing merged ipcbuf.hDavid Gibson2005-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops, replacing the two u64s in struct ipc64_perm with __u32s changed the alignment of that structure, which could mess up userspace. Revert to using two unsigned long longs (which is what ppc32 had originally). ppc64 orignally had two unsigned longs, but long long is the same size on 64 bit, so this should be ok there too. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | | [PATCH] ppc32: Fixed warning in m8xx_setup.cVitaly Bordug2005-11-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds missing header and thus fix the warning issued by ming prototype. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | | [PATCH] ppc32 8xx: fix cpm_dpalloc() commentMarcelo Tosatti2005-11-031-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current comment on top of m8xx_cpm_dpinit is wrong. Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | | [PATCH] ppc32 8xx: Fix harmless warning in 8xx_io/commproc.cMarcelo Tosatti2005-11-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | | [PATCH] ppc32 8xx: export symbols required for modular IDEMarcelo Tosatti2005-11-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes these warnings: Building modules, stage 2. MODPOST *** Warning: "__ide_mm_insl" [drivers/ide/ide-core.ko] undefined! *** Warning: "__ide_mm_outsw" [drivers/ide/ide-core.ko] undefined! *** Warning: "__ide_mm_insw" [drivers/ide/ide-core.ko] undefined! *** Warning: "__ide_mm_outsl" [drivers/ide/ide-core.ko] undefined! Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | | [PATCH] powerpc: always init nvram on 64-bit powermacDavid Woodhouse2005-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there is no Kconfig symbol to indicate that we want nvram support on 64-bit kernels; it's assumed we always want it, so make the powermac setup code always initialize the pmac nvram code if 64-bit. Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | | [PATCH] ppc: Fix build warnings in arch/ppc/kernel/traps.cBecky Bruce2005-11-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest updates to bug.h generate build warnings in traps.c in arch/ppc. Fix print format specifiers to account for change of line type to long from int. Signed-off-by: Becky Bruce <becky.bruce@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | | [PATCH] ppc64: Fix add notifier crashesJohn Rose2005-11-032-3/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extraction of PCI stuff from struct device_node left some false assumptions in notifier code. As a result, dynamic add crashes when non-PCI nodes are added. This patch fixes these assumptions. Signed-off-by: John Rose <johnrose@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | powerpc: Merge remaining RTAS codePaul Mackerras2005-11-0312-185/+147
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves rtas-proc.c and rtas_flash.c into arch/powerpc/kernel, since cell wants them as well as pseries (and chrp can use rtas-proc.c too, at least in principle). rtas_fw.c is gone, with its bits moved into rtas_flash.c and rtas.c. Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | powerpc: Compile fixes for chrp/nvram.cPaul Mackerras2005-11-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Include asm/rtas.h for prototype for rtas_call etc., and make the `done' variable unsigned int since that's what rtas_call wants. Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | powerpc: include <linux/platform_device.h> in pegasos_eth.cPaul Mackerras2005-11-021-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | Merge Paulus' treeStephen Rothwell2005-11-02252-1400/+4357
| | |\ \
| | | * | 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-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * | [PATCH] powerpc: Merge (move) numnodes.h and sparsemem.hDavid Gibson2005-11-023-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ppc64 versions of numnodes.h and sparsemem.h can be safely moved to asm-powerpc with no changes apart from changing the #define to the standard _ASM_POWERPC_ form. There are no ppc32 versions of these files, because they only have any effect if CONFIG_SPARSEMEM is enabled, which it never can be on ppc32. Built and booted on pSeries (POWER5), built for 32-bit powermac. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | | * | Merge ../linux-2.6Paul Mackerras2005-11-02241-1377/+4333
| | | |\ \
| | * | \ \ Merge iSeries include file moveStephen Rothwell2005-11-0254-152/+152
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | modify defines according to _ASM_POWERPC_ISERIES_Kelly Daly2005-11-0215-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | fix incorrect dirKelly Daly2005-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/vio.hKelly Daly2005-11-029-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iSeries/mf.hKelly Daly2005-11-026-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/iseries_io.hKelly Daly2005-11-022-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/lpar_map.hKelly Daly2005-11-026-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-023-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/it_lp_queue.hKelly Daly2005-11-029-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/it_lp_naca.hKelly Daly2005-11-025-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/it_exp_vpd_panel.hKelly Daly2005-11-024-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/hv_types.hKelly Daly2005-11-0220-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/hv_lp_event.hKelly Daly2005-11-0214-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify reference to iseries/hv_lp_config.hKelly Daly2005-11-0212-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/hv_call_xm.hKelly Daly2005-11-028-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/hv_call_sc.hKelly Daly2005-11-0210-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/hv_call_event.hKelly Daly2005-11-027-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | | * | | merge filename and modify references to iseries/hv_call.hKelly Daly2005-11-017-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | | | powerpc: clean up bug.h furtherPaul Mackerras2005-11-022-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | Merge git://oak/home/sfr/kernels/iseries/workPaul Mackerras2005-11-021-21/+8
| | |\ \ \ \
| | | * | | | powerpc: clean up uaccess.hStephen Rothwell2005-11-011-21/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the best from each architecture. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>