aboutsummaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAge
* [PATCH] reset tss->io_bitmap_owner in sys_ioperm()Bart Oldeman2005-11-05
| | | | | | | | | | | | | | | my patch "x86: initialise tss->io_bitmap_owner to something" (commit ID d5cd4aadd3d220afac8e3e6d922e333592551f7d) introduced a problem with a program (DOSEMU) that called ioperm after already doing some port i/o. The problem is that a process switch return causes tss->io_bitmap_base to be set to IO_BITMAP_OFFSET so that the fault (that *really* sets the io bitmap) never triggers. This fixes that regression. Signed-off-by: Bart Oldeman <bartoldeman@users.sourceforge.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2005-11-04
|\
| * powerpc: Fix vmlinux.lds.S for 32-bitPaul Mackerras2005-11-04
| | | | | | | | | | | | | | | | | | | | | | | | We can't currently use asm-ppc/page.h in vmlinux.lds.S, so until we have a merged page.h, define PAGE_SIZE and KERNELBASE locally. Also gets rid of some dynamic executable cruft that we had for 32-bit. With -Ttext=$(KERNELBASE) this didn't cause any problem, but when we changed to putting . = KERNELBASE in the vmlinux.lds.S this cruft caused the text to get linked at 0xa0 instead of 0xc0000000. Oops. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * powerpc: Merge smp.c and smp.hPaul Mackerras2005-11-04
| | | | | | | | | | | | | | This also moves setup_cpu_maps to setup-common.c (calling it smp_setup_cpu_maps) and uses it on both 32-bit and 64-bit. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * Merge branch 'for-paulus' of git://kernel/home/michael/src/work/Paul Mackerras2005-11-04
| |\
| | * Merge with PaulusMichael Ellerman2005-11-03
| | |\
| | * | powerpc: Implement smp_release_cpus() in C not asmMichael Ellerman2005-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason for smp_release_cpus() to be asm, and most people can make more sense of C code. Add an extern declaration to smp.h and remove the custom one in machine_kexec.c Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| | * | powerpc: Cleanup vpa codeMichael Ellerman2005-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | register_vpa() doesn't actually do a VPA register call it just uses the flags you pass it, so rename it to vpa_call() to be clearer. We can then define register_vpa() and unregister_vpa() which are both simple wrappers around vpa_call(). (we'll need unregister_vpa() for kexec soon) We can then cleanup vpa_init(), and because vpa_init() is only called from platforms/pseries we remove the definition in asm-ppc64/smp.h. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| | * | powerpc: Set entry point and text address in linker scriptMichael Ellerman2005-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we set the kernel entry point and the address of the text section in the Makefile, using CONFIG_KERNEL_START. But we've already got <asm/page.h> in the linker script, so we can just use KERNELBASE directly. That means if we ever change KERNELBASE there's one less place to change it. And we can set the entry point with ENTRY(). There are zero differences from "readelf -a vmlinux" with or without this patch. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| | * | powerpc: Make early debugging fit on 80 character terminalMichael Ellerman2005-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's some debugging in prom.c that wraps nastly on 80 character terminals, reformat it to fit. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| | * | powerpc: Merge asm-ppc/kexec.h and asm-ppc64/kexec.hMichael Ellerman2005-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03
| | |/ | |/| | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | Merge git://oak/home/sfr/kernels/iseries/workPaul Mackerras2005-11-03
| |\ \
| | * | powerpc: move include/asm-ppc64/ppc32.h to arch/powerpc/kernelStephen Rothwell2005-11-03
| | | | | | | | | | | | | | | | | | | | | | | | 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-03
| | | | | | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * | | [PATCH] ppc32: Fixed warning in m8xx_setup.cVitaly Bordug2005-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: export symbols required for modular IDEMarcelo Tosatti2005-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| |/ | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | 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-02
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| * Merge Paulus' treeStephen Rothwell2005-11-02
| |\
| | * powerpc: include lmb.h in arch/powerpc/platforms/powermac/setup.cPaul Mackerras2005-11-02
| | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-01
| | |\
| * | \ Merge iSeries include file moveStephen Rothwell2005-11-02
| |\ \ \ | | |/ / | |/| |
| | * | merge filename and modify references to iseries/vio.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iSeries/mf.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/lpar_map.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/it_lp_reg_save.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/it_lp_queue.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/it_lp_naca.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/it_exp_vpd_panel.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/hv_types.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/hv_lp_event.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify reference to iseries/hv_lp_config.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/hv_call_xm.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/hv_call_sc.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/hv_call_event.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/hv_call.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | powerpc: clean up bug.h furtherPaul Mackerras2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-17 02:52:00 -0500