summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2005-10-20ppc64: Minor compilation fixesPaul Mackerras3-13/+16
This defines CONFIG_PPC_STD_MMU for ppc64, changes an instance of sys32_ to compat_sys_ in the ppc64 syscall table, and removes a reference to a non-existent arch/powerpc/xmon/Makefile. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-20powerpc: Move ptrace32.c from arch/ppc64 to arch/powerpcPaul Mackerras4-7/+8
Also corrected my email address in ptrace.c and updated the comments at the top of ptrace32.c. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-19powerpc: Eliminate a compile warning in signal_32.cPaul Mackerras1-2/+3
The second argument of get_sigset_t needed to have the const keyword. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-19ppc: declare smp_ops in asm/smp.h, since platform setup code needs itPaul Mackerras1-0/+1
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-19powerpc: Merge machdep.hPaul Mackerras17-74/+176
A few things change for consistency between ppc32 and ppc64: idle functions return void; *_get_boot_time functions return unsigned long (i.e. time_t) rather than filling in a struct rtc_time (since that's useful to the callers and easier for pmac to generate); *_get_rtc_time and *_set_rtc_time functions take a struct rtc_time; irq_canonicalize is gone; nvram_sync returns void. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-19ppc: Minor smp changes for consistency with ppc64Paul Mackerras11-28/+22
This makes platform code use the smp_ops variable directly instead of ppc_md.smp_ops, removes the two unused `data' and `wait' arguments from the *_message_pass() functions, and removes the call to the never-implemented smp_ops->space_timers() function. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-18Merge rsync://oak/kernels/iseries/work/Paul Mackerras7-309/+195
2005-10-18powerpc: change sys32_ to compat_sys_Stephen Rothwell7-309/+195
This allows us to get rid of one type of entry in systbl.S. In passing we remove the duplicate compat_sys_getdents and compat_sys_utimes for which there are generic versions. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-18powerpc: Fix various compile errors with ARCH=ppc, ppc64 and powerpcPaul Mackerras8-17/+16
This makes ppc use the syscalls.c from arch/powerpc/kernel, exports copy_and_flush from head_32.S for use by prom_init.c (ARCH=powerpc), and consolidates the sys_fadvise64_64 implementations for 32-bit. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-18powerpc: merge ppc signal.c and ppc64 signal32.cStephen Rothwell6-1135/+635
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-17[PATCH] powerpc: Another maple merge tree fixDavid Gibson1-3/+1
With ARCH=powerpc, a spurious ifdef in prom_init prevented the seconday hold loop being correctly copied down on Maple. With this patch, Maple boots with ARCH=powerpc Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-17[PATCH] powerpc: Fix use of LOADBASE in merge treeDavid Gibson1-2/+2
The merge-tree version of LOADBASE actually loads the whole given address from the toc for ppc64. The matching OFF macro adjust for this, using an offset of 0 for ppc64, but we weren't using that in power4_idle. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-17[PATCH] powerpc: replace use of _GLOBAL with .globlKumar Gala3-18/+33
The _GLOBAL() macro is for text symbols only. Changed to using .globl for .data symbols. Signed-off-by: Kumar K. Gala <kumar.gala@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-17powerpc: Make CONFIG_PROC_DEVICETREE independent of CONFIG_PPC_OFPaul Mackerras1-3/+3
... since all platforms will have a device tree. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-17powerpc: Clear the BSS at the start of early_init with ARCH=ppcPaul Mackerras1-0/+4
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-17ppc: Fix various compile errors resulting from ptrace.c mergePaul Mackerras3-37/+116
This introduces flush_{fp,altivec,spe}_to_thread and fixes a branch-too-far error in linking. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-17ppc: Use the merged of_device.c from arch/powerpc/kernelPaul Mackerras2-277/+1
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-17powerpc: Merge syscalls.c and sys_ppc32.c.Paul Mackerras8-376/+147
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-17powerpc: Initialize btext subsystem later, after prom_initPaul Mackerras4-106/+4
We were initializing the btext stuff from prom_init(), thus breaking the rule that all communication between prom_init() and the rest of the kernel has to be via the flattened device tree. This removes the btext initialization calls from prom_init() and initializes it instead after the device tree is unflattened. It would be nice to do it earlier, but that needs some more infrastructure to find the properties we need in the flattened device tree. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-17ppc32: use L1_CACHE_SHIFT/L1_CACHE_BYTESStephen Rothwell14-103/+100
instead of L1_CACHE_LINE_SIZE and LG_L1_CACHE_LINE_SIZE Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-17powerpc: fix 32bit LOADADDR macroStephen Rothwell1-1/+1
I forgot a semicolon. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-14powerpc: move iSeries/HvCallPci.h to platforms/iseries/call_pci.hStephen Rothwell5-8/+6
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-14powerpc: move iSeries/HvCallHpt.h to platforms/iseries/call_hpt.hStephen Rothwell3-6/+6
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-14powerpc: eliminate DsaAddr from pci_dnStephen Rothwell6-262/+23
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-14powerpc: remove ISERIES_[SUB]BUS macrosStephen Rothwell3-17/+10
This allows us to simplify a couple of things. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-14powerpc: move iSeries/iSeries_pci.h to platforms/iseriesStephen Rothwell12-41/+43
The only real user of this file outside platforms/iseries was drivers/net/iseries_veth.c but all it wanted was ISERIES_HV_ADDR() so we move that to abs_addr.h (and lowercase it). Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-13powerpc: fix uname -mStephen Rothwell1-0/+2
It will now give ppc64 on 64bit platforms and ppc on 32bit platforms. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-13powerpc: merge ptrace.cStephen Rothwell5-398/+141
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-13ppc64: use powerpc of_device.cStephen Rothwell3-276/+2
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-13ppc64: fix arch/ppc64/kernel/MakefileStephen Rothwell1-2/+1
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-13ppc64: merge binfmt_elf32.cStephen Rothwell5-51/+7
and use start_thread for both 32 and 64 bit bineries. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-13powerpc: make 64 bit binaries workStephen Rothwell1-5/+1
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-13powerpc: create 32 bit LOADADDR macroStephen Rothwell2-4/+6
and use it in misc_32.S Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-13powerpc: consolidate cputable.cStephen Rothwell6-438/+329
Also simplify arch/ppc64/kernel/Makefile Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-12ppc64: Remove duplicate versions of some headersPaul Mackerras3-386/+0
This removes three headers from include/asm-ppc64 that are now in include/asm-powerpc and are sufficiently similar that they can be used with ARCH=ppc64. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-12powerpc: Bring in some changes made to arch/ppc and include/asm-ppc64Paul Mackerras4-2/+13
Recent commits upstream have changed files which are currently duplicated in arch/powerpc and include/asm-powerpc. This updates them with the corresponding changes. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-12powerpc: Move default hash table size calculation to hash_utils_64.cPaul Mackerras2-21/+22
We weren't computing the size of the hash table correctly on iSeries because the relevant code in prom.c was #ifdef CONFIG_PPC_PSERIES. This moves the code to hash_utils_64.c, makes it unconditional, and cleans it up a bit. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-12Merge from Linus' treePaul Mackerras626-4578/+23932
2005-10-12powerpc: make iSeries boot againStephen Rothwell4-6/+8
On ARCH=ppc64 we were getting htab_hash_mask recalculated to the correct value for our particular machine by accident. In the merge tree, that code was commented out, so htab_hash_mask was being corrupted. We now set ppc64_pft_size instead which gets htab_has_mask calculated correctly for us later. We should put an ibm,pft-size property in the device tree at some point. Also set -mno-minimal-toc in some makefiles. Allow iSeries to configure PROC_DEVICETREE. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-12powerpc: pci_dn's should point to their device_node'sStephen Rothwell1-0/+1
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-10-11Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds5-11/+8
2005-10-11[SPARC64]: Fix net booting on Ultra5David S. Miller1-2/+6
We were not doing alignment properly when remapping the kernel image. What we want is a 4MB aligned physical address to map at KERNBASE. Mistakedly we were 4MB aligning the virtual address where the kernel initially sits, that's wrong. Instead, we should PAGE align the virtual address, then 4MB align the physical address result the prom gives to us. Signed-off-by: David S. Miller <davem@davemloft.net>
2005-10-11[PATCH] Don't map the same page too muchHugh Dickins1-0/+3
Refuse to install a page into a mapping if the mapping count is already ridiculously large. You probably cannot trigger this on 32-bit architectures, but on a 64-bit setup we should protect against it. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-11[PATCH] ppc64: Add R_PPC64_TOC16 module relocPeter Bergner1-0/+13
Newer gcc's are generating this relocation, so the module loader needs to handle it. Signed-off-by: Peter Bergner <bergner@vnet.ibm.com> Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-11[PATCH] V4L: Enable s-video input on DViCO FusionHDTV5 LiteMichael Krufky1-2/+2
* bttv-cards.c: - Enable S-Video input on DViCO FusionHDTV5 Lite Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-11[PATCH] m32r: trap handler code for illegal trapsHirokazu Takata2-17/+25
This patch prevents illegal traps from causing m32r kernel's infinite loop execution. Signed-off-by: Naoto Sugai <sugai@isl.melco.co.jp> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-11[PATCH] binfmt_elf bss padding fixakpm@osdl.org1-1/+1
Nir Tzachar <tzachar@cs.bgu.ac.il> points out that if an ELF file specifies a zero-length bss at a whacky address, we cannot load that binary because padzero() tries to zero out the end of the page at the whacky address, and that may not be writeable. See also http://bugzilla.kernel.org/show_bug.cgi?id=5411 So teach load_elf_binary() to skip the bss settng altogether if the elf file has a zero-length bss segment. Cc: Roland McGrath <roland@redhat.com> Cc: Daniel Jacobowitz <dan@debian.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-11[PATCH] ppc highmem fixPaolo Galtieri1-2/+2
I've noticed that the calculations for seg_size and nr_segs in __dma_sync_page_highmem() (arch/ppc/kernel/dma-mapping.c) are wrong. The incorrect calculations can result in either an oops or a panic when running fsck depending on the size of the partition. The problem with the seg_size calculation is that it can result in a negative number if size is offset > size. The problem with the nr_segs caculation is returns the wrong number of segments, e.g. it returns 1 when size is 200 and offset is 4095, when it should return 2 or more. Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-11[PATCH] madvise: Avoid returning error code -EBADF for anonymous mappingsSuzuki1-7/+4
Revert this recent correctness change: Douglas Crosher <dcrosher@scieneer.com> reported that it broke an existing application, and that madvise() works without error on anonymous mappings on Solaris. This means that madvise() will remain non-standards-compliant: we should return -EBADF for all requests against non-file-backed vma's, but Linux only does this for MADV_WILLNEED requests. Signed-off-by: Suzuki K P <suzuki@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-11[PATCH] nfsacl: Solaris VxFS compatibility fixAndreas Gruenbacher1-35/+35
Here is a compatibility fix between Linux and Solaris when used with VxFS filesystems: Solaris usually accepts acl entries in any order, but with VxFS it replies with NFSERR_INVAL when it sees a four-entry acl that is not in canonical form. It may also fail with other non-canonical acls -- I can't tell, because that case never triggers: We only send non-canonical acls when we fake up an ACL_MASK entry. Instead of adding fake ACL_MASK entries at the end, inserting them in the correct position makes Solaris+VxFS happy. The Linux client and server sides don't care about entry order. The three-entry-acl special case in which we need a fake ACL_MASK entry was handled in xdr_nfsace_encode. The patch moves this into nfsacl_encode. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>