aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge iSeries include file moveStephen Rothwell2005-11-02
|\
| * modify defines according to _ASM_POWERPC_ISERIES_Kelly Daly2005-11-01
| | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * fix incorrect dirKelly Daly2005-11-01
| | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * 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/iseries_io.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>
* | Merge git://oak/home/sfr/kernels/iseries/workPaul Mackerras2005-11-01
|\ \
| * | powerpc: clean up uaccess.hStephen Rothwell2005-10-31
| | | | | | | | | | | | | | | | | | Use the best from each architecture. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | | 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>
* | | powerpc: Use rtas_call not call_rtas in CHRP codePaul Mackerras2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | [PATCH] ppc bug.h namespace pollutionAl Viro2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DATA_TYPE is really not a good thing to put into header that gets included all over the tree... Just make the cast always (long) and get rid of DATA_TYPE altogether. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [PATCH] powerpc: Merge futex.hDavid Gibson2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch merges the ppc32 and ppc64 versions of futex.h, essentially by taking the ppc64 version as the powerpc version. The old ppc32 version did not implement the futex_atomic_op_inuser() callback (it always returned -ENOSYS), so FUTEX_WAKE_OP would not work on ppc32. In fact the ppc64 version of this function is almost suitable for ppc32 as well - the only change needed is to extend ppc_asm.h with a macro expanding to to the right pseudo-op to store a pointer (either ".long" or ".llong"). Built and booted on pSeries. Built for 32-bit powermac. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [PATCH] powerpc: Fix merged ipcbuf.hDavid Gibson2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | Oops, when merging ipcbuf.h, I forgot that 'u64' can't be used in user-visible headers. This patch corrects the problem, replacing the unused fields with an array of four __u32s. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | powerpc: Fix pseries (64-bit) buildPaul Mackerras2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | powerpc: Fix BUG/WARN macros for 64-bitPaul Mackerras2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug_entry struct had an int in the middle of pointers and unsigned longs, and the inline asm that generated the bug table entries didn't insert the necessary padding, so the fields following it didn't get initialized properly and an oops resulted. This changes the int field (the line number) to a long so that all the fields are the same size and no padding is required. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [PATCH] powerpc: Merge bitops.hDavid Gibson2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Merge ipcbuf.hDavid Gibson2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch merges ppc32 and ppc64 versions of ipcbuf.h. The merge is essentially trivial, since the structure defined in each version was already identical. Only wrinkle is that the merged version now includes linux/types.h in order to get the fixed width integer types. In fact, the old versions probably should have been including that anyway, since the file uses various __kernel_*_t types. Built and booted on G5, built for 32-bit pmac, but not booted, since the merge tree currently doesn't boot there. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [PATCH] powerpc: move arch/ppc64/kernel/bpa* to arch/powerpc/platforms/cellArnd Bergmann2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | 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-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-01
|/ / | | | | | | | | | | | | | | | | 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: use asm-generic/termios.hStephen Rothwell2005-10-31
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | powerpc: remove duplicate ioctl definitionsStephen Rothwell2005-10-31
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | powerpc: make mem= work on iSeries againStephen Rothwell2005-10-31
| | | | | | | | | | | | | | | | 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-10-31
| | | | | | | | | | | | | | | | 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: merge uaccess.hStephen Rothwell2005-10-31
|/ | | | | | There is still a bug to be fixed and more merging to be done. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* powerpc: import a fix from arch/ppc/mm/pgtable.cPaul Mackerras2005-10-30
| | | | | | ... 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-30
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* Merge ../linux-2.6 by handPaul Mackerras2005-10-30
|\
| * Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2005-10-30
| |\
| | * [SERIAL] remove unneeded code from serial_core.cJayachandran C2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes an issue reported by Coverity in serial/serial_core.c Error reported: Variable "&((info)->tty)->flags" tracked as NULL was passed to a function that dereferences it. The later statements in the function assumes 'info->tty != NULL', so this check is not necessary. Probably a 'BUG_ON(info->tty == NULL)' can be added. Signed-off-by: Jayachandran C. <c.jayachandran at gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-10-30
| |\ \
| | * | [ARM] arch-ixp4xx/io.h: make const args const to remove compiler warningJohn Bowler2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiler warning fix; the inline callers of these APIs were changed to have const vaddr parameters. Signed-off-by: John Bowler <jbowler@acm.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] Support pcmcia slot on sharp sl-5500Pavel Machek2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for pcmcia slot on sharp zaurus sl-5500. pxa2xx_sharpsl.c thus becomes quite miss-named, but I guess that is not worth fixing? Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] Sharp sl-5500 touchscreen supportPavel Machek2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for sharp zaurus sl-5500 touchscreen. It introduces some not-too-nice ifs, but I guess copying whole ucb1x00-ts.c would be bad idea... Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-12 04:48:40 -0500