aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel
Commit message (Collapse)AuthorAge
...
* | ppc64/powerpc: Fix time initialization on SMP systemsPaul Mackerras2005-10-22
| | | | | | | | | | | | | | | | | | | | | | This moves smp_space_timers from arch/ppc64/kernel/smp.c to arch/powerpc/kernel/time.c and makes it initialize last_jiffy[] instead of paca[].next_jiffy_update_tb, since last_jiffy[] is now what the time code uses. It also declares smp_space_timers in include/asm-powerpc/time.h and gets rid of an ifdef in div128_by_32. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Merge thread_info.hDavid Gibson2005-10-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge ppc32 and ppc64 versions of thread_info.h. They were pretty similar already, the chief changes are: - Instead of inline asm to implement current_thread_info(), which needs to be different for ppc32 and ppc64, we use C with an asm("r1") register variable. gcc turns it into the same asm as we used to have for both platforms. - We replace ppc32's 'local_flags' with the ppc64 'syscall_noerror' field. The noerror flag was in fact the only thing in the local_flags field anyway, so the ppc64 approach is simpler, and means we only need a load-immediate/store instead of load/mask/store when clearing the flag. - In readiness for 64k pages, when THREAD_SIZE will be less than a page, ppc64 used kmalloc() rather than get_free_pages() to allocate the kernel stack. With this patch we do the same for ppc32, since there's no strong reason not to. - For ppc64, we no longer export THREAD_SHIFT and THREAD_SIZE via asm-offsets, thread_info.h can now be safely included in asm, as on ppc32. Built and booted on G4 Powerbook (ARCH=ppc and ARCH=powerpc) and Power5 (ARCH=ppc64 and ARCH=powerpc). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] Fix broken initialization of conswitchp for ARCH=ppc64David Gibson2005-10-21
| | | | | | | | | | | | | | | | | | | | In the merge tree, commit 0458060c1c59c5378d8fb5daabe18cf4681c35cd broke boot on some machines because the initialization of conswitchp was moved to arch/powerpc/kernel/setup_64.c, but a corresponding copy was not added to arch/ppc64/kernel/setup.c. This patch fixes it. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc/ppc/ppc64: Various compile fixes.Paul Mackerras2005-10-20
| | | | | | | | | | | | | | | | | | | | This declares powersave_nap in system.h and makes it an int everywhere, fixes typos for the maple platform, fixes a couple of places where I missed removing the last two arguments from a message_pass function, and makes ppc64 consistent with ppc32 in the type of the pci_bridge.cfg_data field. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | ppc64: Use the merged mpic.cPaul Mackerras2005-10-20
| | | | | | | | | | | | This means we now compile in arch/powerpc/sysdev for ARCH=ppc64. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: Move some calculations from xxx_calibrate_decr to time_initPaul Mackerras2005-10-20
| | | | | | | | | | | | | | | | | | | | Previously the individual xxx_calibrate_decr functions would each print the timebase and cpu frequency and calculate several values such as tb_to_us and tb_to_xs. This moves those printks and calculations into time_init just after the call to the platform's calibrate_decr function. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | ppc: rename pci_assign_all_busses to pci_assign_all_busesPaul Mackerras2005-10-20
| | | | | | | | | | | | ... for consistency with ppc64 and to make merging easier. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: Move smp_mpic_message_pass into mpic.cPaul Mackerras2005-10-20
| | | | | | | | | | | | | | Having it here rather than in arch/ppc64/kernel/smp.c means that we can use it on 32-bit SMP systems easily with ARCH=powerpc. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | ppc64: Change ppc_md.get_cpuinfo to ppc_md.show_cpuinfoPaul Mackerras2005-10-20
| | | | | | | | | | | | | | ... for consistency with ppc32; also add in ppc32's show_percpuinfo function. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Merge ppc64 pmc.[ch] with ppc32 perfmon.[ch]David Gibson2005-10-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patches the ppc32 and ppc64 versions of the headers and .c files with helper functions for manipulating the performance counting hardware. As a side effect, it removes use of the term "perfmon" from ppc32, thus avoiding confusion with the unrelated performance counter interface from HP Labs also called "perfmon". Built, but not booted, for g5, pSeries, iSeries, and 32-bit Powermac with both ARCH=powerpc and ARCH=ppc{,64} as appropriate. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: Merge time.c and asm/time.h.Paul Mackerras2005-10-19
| | | | | | | | | | | | | | | | | | | | We now use the merged time.c for both 32-bit and 64-bit compilation with ARCH=powerpc, and for ARCH=ppc64, but not for ARCH=ppc32. This removes setup_default_decr (folds its function into time_init) and moves wakeup_decrementer into time.c. This also makes an asm-powerpc/rtc.h. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | ppc64: Minor compilation fixesPaul Mackerras2005-10-19
| | | | | | | | | | | | | | | | 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>
* | powerpc: Move ptrace32.c from arch/ppc64 to arch/powerpcPaul Mackerras2005-10-19
| | | | | | | | | | | | | | 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>
* | powerpc: Merge machdep.hPaul Mackerras2005-10-19
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge rsync://oak/kernels/iseries/work/Paul Mackerras2005-10-18
|\ \
| * | powerpc: change sys32_ to compat_sys_Stephen Rothwell2005-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | powerpc: Fix various compile errors with ARCH=ppc, ppc64 and powerpcPaul Mackerras2005-10-18
|/ / | | | | | | | | | | | | | | 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>
* | powerpc: merge ppc signal.c and ppc64 signal32.cStephen Rothwell2005-10-17
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | powerpc: Merge syscalls.c and sys_ppc32.c.Paul Mackerras2005-10-17
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: move iSeries/iSeries_pci.h to platforms/iseriesStephen Rothwell2005-10-14
| | | | | | | | | | | | | | | | 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>
* | powerpc: merge ptrace.cStephen Rothwell2005-10-13
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | ppc64: use powerpc of_device.cStephen Rothwell2005-10-13
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | ppc64: fix arch/ppc64/kernel/MakefileStephen Rothwell2005-10-13
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | ppc64: merge binfmt_elf32.cStephen Rothwell2005-10-12
| | | | | | | | | | | | and use start_thread for both 32 and 64 bit bineries. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | powerpc: consolidate cputable.cStephen Rothwell2005-10-12
| | | | | | | | | | | | Also simplify arch/ppc64/kernel/Makefile Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | Merge from Linus' treePaul Mackerras2005-10-12
|\|
| * [PATCH] ppc64: Add R_PPC64_TOC16 module relocPeter Bergner2005-10-11
| | | | | | | | | | | | | | | | | | | | 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>
| * [PATCH] ppc64: Fix PCI hotplugAnton Blanchard2005-10-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | pSeries_irq_bus_setup is marked __devinit but references s7a_workaround which is marked __initdata. Depending on who got the memory for s7a_workaround (and if the value was now positive), it was possible for PCI hotplugged devices to have 3 subtracted from their interrupt number. This would happen randomly and caused me much confusion :) Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] gfp flags annotations - part 1Al Viro2005-10-08
| | | | | | | | | | | | | | | | | | | | | | | | - added typedef unsigned int __nocast gfp_t; - replaced __nocast uses for gfp flags with gfp_t - it gives exactly the same warnings as far as sparse is concerned, doesn't change generated code (from gcc point of view we replaced unsigned int with typedef) and documents what's going on far better. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] ppc64: fix up()/down() usage for kprobe_mutexAnanth N Mavinakayanahalli2005-10-01
| | | | | | | | | | | | | | | | The incorrect kprobe_mutex usage on x86_64 had percolated to ppc64 too. First noticed by Yanmin Zhang. Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] bogus BUILD_BUG_ON() in bpa_iommuAl Viro2005-09-30
| | | | | | | | | | | | | | | | | | | | | | | | BUILD_BUG_ON(1) is asking for trouble (and getting it) when used in that manner - dead code elimination happens after we parse it and invalid type is invalid type, dead code or not. It might be version-dependent, but at least 4.0.1 refuses to accept that. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | ppc64: compile fix - define execve in misc.SPaul Mackerras2005-10-11
| | | | | | | | | | | | | | | | This used to be inline in include/asm-ppc64/unistd.h, but isn't inline in the merged include/asm-powerpc/unistd.h, so we need a definition here. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | ppc64: Use merged versions of init_task.c and process.c.Paul Mackerras2005-10-11
| | | | | | | | | | | | | | These two files are now built in arch/powerpc/kernel instead of arch/ppc64/kernel. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: Get 64-bit configs to compile with ARCH=powerpcPaul Mackerras2005-10-10
| | | | | | | | | | | | | | | | This is a bunch of mostly small fixes that are needed to get ARCH=powerpc to compile for 64-bit. This adds setup_64.c from arch/ppc64/kernel/setup.c and locks.c from arch/ppc64/lib/locks.c. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: move lparmap.c to arch/powerpc/kernelPaul Mackerras2005-10-10
| | | | | | | | | | | | | | Since lparmap.s gets included in arch/powerpc/kernel/head_64.S, this avoids depending on a file in another directory. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: Reduce the 32/64-bit diffs in vmlinux.lds.SPaul Mackerras2005-10-10
| | | | | | | | | | | | Also adds the definition of the _sdata symbol to the ppc64 vmlinux.lds.S. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | ppc64: Use SPRN_ prefix for special purpose register namesPaul Mackerras2005-10-10
| | | | | | | | | | | | | | Now that we are using the merged reg.h we have to use the SPRN_xxx names rather than the xxx names. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: move pSeries files to arch/powerpc/platforms/pseriesPaul Mackerras2005-10-10
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* | ppc64: Use the merged lmb routinesPaul Mackerras2005-10-10
| | | | | | | | | | | | | | The only real change here is that lmb_enforce_memory_limit now takes the memory_limit as a parameter instead of as a global variable. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: Make some #includes explicit.Paul Mackerras2005-10-10
| | | | | | | | | | | | | | In preparation for merging processor.h, this adds some explicit but won't be after the merge. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: Use SPRN_xxx rather than xxx for SPR numbersPaul Mackerras2005-10-10
| | | | | | | | | | | | | | | | | | | | This changes symbols like HID0, SPRG3, SRR0, SRR1 etc. that refer to special purpose registers to SPRN_HID0, SPRN_SPRG3, etc. Using the SPRN_ symbols clutters the namespace less, and the forthcoming merge of asm/processor.h and asm/reg.h is going to remove the non-SPRN_ versions. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: make iSeries buildStephen Rothwell2005-10-01
| | | | | | | | | | | | | | | | Merge vmlinux.lds.S. Also remove arch/powerpc/kernel/vmlinux.lds which is a generated file. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | ppc64: simplify the build a littleStephen Rothwell2005-10-01
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | powerpc: merge idle_power4.S and trapc.sStephen Rothwell2005-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | Use idle_power4.S from ppc64 as we are not going to support 32 bit power4 in the merged tree. Merge ppc64 traps.c into powerpc traps.c: use ppc64 versions of exception routine names (as they don't have StudlyCaps) make all the versions if die() have the same prototype Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | powerpc: Move lparmap.c to powerpc/platformsStephen Rothwell2005-09-30
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | powerpc: remove old vector.S filesStephen Rothwell2005-09-30
| | | | | | | | | | | | Update old kernel/Makefiles to cope Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | Merge by hand from Linus' tree.Paul Mackerras2005-09-28
|\| | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] ppc64: Add missing barrier() in kexec codeAnton Blanchard2005-09-28
| | | | | | | | | | | | | | | | | | | | Mikey and I were testing kexec and hit a lockup. It turns out gcc 4.0 optimises the kexec_prepare_cpus loop so we avoid reloading paca.hw_cpu_id. A gcc barrier() fixes the problem. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge Stephen Rothwell's patchesPaul Mackerras2005-09-28
|\ \
| * | ppc64 iSeries: use device_node instead of iSeries_Device_nodeStephen Rothwell2005-09-28
| | | | | | | | | | | | | | | | | | There needs to be more cleanup after this. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>