summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] uml: fix debug output on x86_64Jeff Dike2006-01-111-2/+2
| | | | | | | | | | The debug-stub patch was broken on x86_64 because it thinks the frame size there is 168 words. In reality, it is 168 bytes, and using HOST_FRAME_SIZE, which is expressed in consistent units across architectures, fixes this. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] uml: eliminate doubled boot outputJeff Dike2006-01-111-1/+1
| | | | | | | | | CON_PRINTBUFFER was a bad idea for the mconsole console. It causes the boot output to be printed twice. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] uml: revert compile-time option checkingJeff Dike2006-01-111-4/+0
| | | | | | | | | Undo the previous no-modes patch since Adrian Bunk sent in a kbuild way of doing the same thing. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] uml: update Kconfig helpJeff Dike2006-01-111-4/+4
| | | | | | | | | | The MODE_TT help was a little outdated. This updates it in light of the existence of skas0 mode. It's also turned off by default since it is mostly obsoleted by skas0 mode. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] uml: fix missing KBUILD_BASENAMEJeff Dike2006-01-114-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | 2.6.15-mm1 caused kernel-offsets.c to stop compiling with a syntax error in a header. The problem was with KBUILD_BASENAME, which didn't get a definition with the by-hand compilation in the main UML Makefile. This was OK before since the expansion was syntactically the same as the KBUILD_BASENAME token. With -mm1, the expansion is now a quote-delimited string, so there needs to be a definition of it. Since kernel-offsets.c is basically the same as other arches' asm-offsets.c, and those seem to build OK, this patch turns kernel-offsets.c into asm-offsets.c. kernel-offsets.c is in arch/um/sys-$(SUBARCH), i.e. sys-i386 and sys-x86_64, while kbuild expects it to be in arch/um/kernel. kernel-offsets.c is moved to arch/um/include/sysdep-$(SUBARCH)/kernel-offsets.h, which is included by arch/um/kernel/asm-offsets.c. With that, include/asm-um/asm-offsets.h is generated automatically. kernel-offsets.h continues to exist because it needs to be accessible to userspace UML code, and include/asm-um isn't. So, a symlink is made from arch/um/include/kernel-offsets.h to include/asm-um/asm-offsets.h. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] include/asm-h8300/page.h: remove unused KTHREAD_SIZE #defineAdrian Bunk2006-01-111-6/+0
| | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] mm: gfp_atomic commentsPaul Jackson2006-01-112-1/+3
| | | | | | | | | Clarify in comments that GFP_ATOMIC means both "don't sleep" and "use emergency pools", hence both ALLOC_HARDER and ALLOC_HIGH. Signed-off-by: Paul Jackson <pj@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Restore KERN_EMERG to each line printed by bad_pageHugh Dickins2006-01-111-3/+3
| | | | | | Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-01-1124-48/+61
|\
| * [PKT_SCHED] net/sched/Kconfig: fix typo in NET_EMATCH_META descriptionAdrian Bunk2006-01-111-1/+1
| | | | | | | | | | | | | | Noted by Matt LaPlante <webmaster@cyberdogtech.com>. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [PKT_SCHED] ematch: Remove bogus include.Evgeniy Polyakov2006-01-111-1/+0
| | | | | | | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NET]: Fix diverter build.Evgeniy Polyakov2006-01-111-1/+1
| | | | | | | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NET]: Remove more unneeded typecasts on *malloc()Kris Katterjohn2006-01-1116-41/+34
| | | | | | | | | | | | | | | | | | This removes more unneeded casts on the return value for kmalloc(), sock_kmalloc(), and vmalloc(). Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net> Acked-by: James Morris <jmorris@namei.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [IPV6]: Avoid calling ip6_xmit() with NULL skDavid Woodhouse2006-01-111-2/+18
| | | | | | | | | | | | | | | | | | | | The ip6_xmit() function now assumes that its sk argument is non-NULL, which isn't currently true when TCPv6 code is sending RST or ACK packets. This fixes that code to use a socket of its own for sending such packets, as TCPv4 does. (Thanks Andi for the pointer). Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NETFILTER]: ip_ct_proto_gre_fini() cannot be __exitDavid S. Miller2006-01-112-2/+5
| | | | | | | | | | | | It is invoked from failures paths of __init code. Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NET]: Some more missing include/etherdevice.h includesDavid S. Miller2006-01-112-0/+2
| | | | | | | | | | | | For compare_ether_addr() Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-01-111-1/+1
|\ \ | |/ |/|
| * [SPARC64] arch/sparc64/Kconfig: fix HUGETLB_PAGE_SIZE_64K dependenciesAdrian Bunk2006-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a typo in the dependencies of HUGETLB_PAGE_SIZE_64K. It might be more logical to rename the HUGETLB_PAGE_SIZE_*K dependencies to HUGETLB_PAGE_SIZE_*KB, but let's fix this bug first. This bug was reported by Jean-Luc Leger <reiga@dspnet.fr.eu.org>. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [PATCH] new tty buffering access fixPaul Fulghum2006-01-111-3/+3
| | | | | | | | | | | | | | | | | | Fix typos in new tty buffering that incorrectly access and update buffers in pending queue. Signed-off-by: Paul Fulghum <paulkf@microgate.com> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Fix mutex_trylock() copy-and-paste bug (x86, x86-64, generic mutex-dec.h)Linus Torvalds2006-01-113-3/+3
| | | | | | | | | | | | | | | | | | Noticed by Arjan originally on x86-64, then Ingo on x86, and finally me grepping for it in the generic version. Bad parenthesis nesting. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2006-01-1132-127/+376
|\ \ | |/ |/|
| * [PATCH] powerpc: Don't build crash.c for PPC32Michael Ellerman2006-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | arch/powerpc/kernel/crash.c isn't safe for PPC32 (yet?), so don't build it. Built with CONFIG_KEXEC=y for pmac32_defconfig, pseries_defconfig, and g5_defconfig. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: Fix clean_files in arch/powerpc/boot MakefileKumar Gala2006-01-111-1/+1
| | | | | | | | | | | | | | clean-files was being set twice rather than being appended to. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * powerpc/32: Fix compile error caused by pud_t/pgt_t confusionPaul Mackerras2006-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | PPC32 is still using asm-generic/4level-fixup.h, but asm-powerpc/page.h was defining pud_t and pgd_t. Depending on the order in which files got included, this could result in a compilation error. Tweak the ifdef so that page.h doesn't try to define pud_t on ppc32 (which uses 2-level page tables). Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: Remove redundant setting of htab_addressMichael Ellerman2006-01-111-6/+0
| | | | | | | | | | | | | | | | iSeries doesn't need to set the htab_address explicitly, htab_initialize() will do it for us later. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: Add ibm,pft-size to iSeries device treeMichael Ellerman2006-01-111-2/+11
| | | | | | | | | | | | | | | | | | To make iSeries just a teensy bit less special, create ibm,pft-size properties in the iSeries device tree. We can then rely on htab_dt_scan_pftsize() to set ppc64_pft_size for us. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: Add some missing .gitignore'sKumar Gala2006-01-113-0/+22
| | | | | | | | | | | | | | ignore generated files under arch/powerpc Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: Updated Kconfig and Makefiles for 83xx supportKumar Gala2006-01-117-53/+85
| | | | | | | | | | | | | | | | | | | | | | Updated Kconfig & Makefiles in prep for adding support for the Freescale MPC83xx family of processors to arch/powerpc. Moved around some config options that are more globally applicable to other PowerPC processors. Added a temporary config option (83xx) to match existing arch/ppc support for the MPC83xx line. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] spufs: Suspend/restore MFC DMA operations at SPU context switch.Geoff Levand2006-01-111-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | The SPE Book IV indicates that MFC DMA operations must be suspended and restored on SPU context switch (in Step 8). This patch adds that operation, which is missing from the current spufs implementation. Signed-off-by: Masato Noguchi <Masato.Noguchi@jp.sony.com> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Acked-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: fix for compile problem in kdump code when SMP disabledHaren Myneni2006-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | This patch fixes the compilation error (shown below) when CONFIG_SMP=n. arch/powerpc/kernel/crash.c: In function `crash_kexec_prepare_cpus': arch/powerpc/kernel/crash.c:236: error: implicit declaration of function `smp_release_cpus' Signed-off-by: Haren Myneni <haren@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * powerpc: Fix compile error when CONFIG_PROC_VMCORE is not definedPaul Mackerras2006-01-111-0/+2
| | | | | | | | | | | | We were getting elfcorehdr_addr undefined in this case. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: fix up iSeries console after TTY layer buffering revampStephen Rothwell2006-01-111-3/+4
| | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc/64: per cpu data optimisationsAnton Blanchard2006-01-113-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current ppc64 per cpu data implementation is quite slow. eg: lhz 11,18(13) /* smp_processor_id() */ ld 9,.LC63-.LCTOC1(30) /* per_cpu__variable_name */ ld 8,.LC61-.LCTOC1(30) /* __per_cpu_offset */ sldi 11,11,3 /* form index into __per_cpu_offset */ mr 10,9 ldx 9,11,8 /* __per_cpu_offset[smp_processor_id()] */ ldx 0,10,9 /* load per cpu data */ 5 loads for something that is supposed to be fast, pretty awful. One reason for the large number of loads is that we have to synthesize 2 64bit constants (per_cpu__variable_name and __per_cpu_offset). By putting __per_cpu_offset into the paca we can avoid the 2 loads associated with it: ld 11,56(13) /* paca->data_offset */ ld 9,.LC59-.LCTOC1(30) /* per_cpu__variable_name */ ldx 0,9,11 /* load per cpu data Longer term we can should be able to do even better than 3 loads. If per_cpu__variable_name wasnt a 64bit constant and paca->data_offset was in a register we could cut it down to one load. A suggestion from Rusty is to use gcc's __thread extension here. In order to do this we would need to free up r13 (the __thread register and where the paca currently is). So far Ive had a few unsuccessful attempts at doing that :) The patch also allocates per cpu memory node local on NUMA machines. This patch from Rusty has been sitting in my queue _forever_ but stalled when I hit the compiler bug. Sorry about that. Finally I also only allocate per cpu data for possible cpus, which comes straight out of the x86-64 port. On a pseries kernel (with NR_CPUS == 128) and 4 possible cpus we see some nice gains: total used free shared buffers cached Mem: 4012228 212860 3799368 0 0 162424 total used free shared buffers cached Mem: 4016200 212984 3803216 0 0 162424 A saving of 3.75MB. Quite nice for smaller machines. Note: we now have to be careful of per cpu users that touch data for !possible cpus. At this stage it might be worth making the NUMA and possible cpu optimisations generic, but per cpu init is done so early we have to be careful that all architectures have their possible map setup correctly. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: parallel port init fixMichael Neuling2006-01-111-2/+26
| | | | | | | | | | | | | | This stops parport from accessing nonexistent parallel ports. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: Make early debugging configurable via KconfigMichael Ellerman2006-01-118-43/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds Kconfig entries to control the early debugging options, currently in setup_64.c. Doing this via Kconfig rather than #defines means you can have one source tree, which is buildable for multiple platforms - and you can enable the correct early debug option for each platform via .config. I made udbg_early_init() a static inline because otherwise GCC is to daft to optimise it away when debugging is off. Now that we have udbg_init_rtas() we can make call_rtas_display_status* static. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: Early debugging support for iSeriesMichael Ellerman2006-01-113-10/+26
| | | | | | | | | | | | | | | | | | | | | | Connect iSeries up to the standard early debugging infrastructure. To actually use this you need to enable the iSeries early debugging in setup_64.c. Then after the messages are logged hit Ctrl-x Ctrl-x on your console to dump the Hypervisor console buffer. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] powerpc: remove remaining crash_notes variable from machine_kexec.cOlaf Hering2006-01-111-6/+0
| | | | | | | | | | | | | | | | | | | | remove remaining crash_notes definition to fix compile error /dev/shm/linux-2.6/arch/powerpc/kernel/machine_kexec.c:21: error: conflicting types for `crash_notes' /dev/shm/linux-2.6/include/linux/kexec.h:129: error: previous declaration of `crash_notes' Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] PCI Hotplug/powerpc: module build breaklinas2006-01-111-0/+3
| | | | | | | | | | | | | | | | | | The RPAPHP hoplug driver will not build as a module, because it calls on a pcibios routine which is not exported. This exports the symbol. Problem reported by Olaf Hering <olh@suse.de> Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] enable the RTC driver in ppc64_defconfigOlaf Hering2006-01-111-1/+1
| | | | | | | | | | | | | | Enable the RTC driver. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] fix/simplify mutex debugging codeDavid Woodhouse2006-01-117-8/+9
| | | | | | | | | | | | | | | | | | | | Let's switch mutex_debug_check_no_locks_freed() to take (addr, len) as arguments instead, since all its callers were just calculating the 'to' address for themselves anyway... (and sometimes doing so badly). Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [MUTEX]: linux/mutex.h needs linux/linkage.h tooDavid S. Miller2006-01-111-0/+1
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6Linus Torvalds2006-01-1037-228/+373
|\ \
| * | [PARISC] Use STABS_DEBUG macro from vmlinux.lds.hMatthew Wilcox2006-01-101-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | Cleanup vmlinux.lds.S by using STABS_DEBUG macro from vmlinux.lds.h instead of repeating the sections. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | [PARISC] Fix Dino reporting on J2240Matthew Wilcox2006-01-102-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix Dino reporting on J2240. This particular machine thought it had a Cujo. Also add J2240 Dino chip to the hp_hardware_list. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | [PARISC] stifb: Remove obsolete MODULE_PARM()Helge Deller2006-01-101-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | The bpp module parameter has been obsoleted in favour of a setup string, so remove the MODULE_PARM. Signed-off-by: Helge Deller <deller@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | [PARISC] stifb: Fix framebuffer console at 32bppHelge Deller2006-01-101-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix stifb framebuffer console at 32bpp on a HCRX-24 card by properly setting DIRECTCOLOR. Also a few nice cleanups to the code. Signed-off-by: Helge Deller <deller@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | [PARISC] stifb: use F_EXTEND macroHelge Deller2006-01-101-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | Use the F_EXTEND() macro instead of open coding it with an #ifdef. Provides a nice cleanup. Signed-off-by: Helge Deller <deller@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | [PARISC] Use C99 initializers in asm-parisc/processor.hAlexey Dobriyan2006-01-101-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup asm-parisc/processor.h to use C99 initializers in INIT_THREAD(). Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | [PARISC] pdc_stable: More robust sysfs error checkingThibaut VARENE2006-01-101-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pdc_stable 0.10: As mentioned on LKML, pdc_stable wasn't checky enough on the return values of some calls. This patch makes it more robust to errors when registering objects in sysfs. Signed-off-by: Thibaut VARENE <varenet@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | [PARISC] Make PCI_HOST_ADDR and PCI_BUS_ADDR symmetricalGrant Grundler2006-01-101-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change to asm-parisc/pci.h makes the define of PCI_HOST_ADDR symmetrical with PCI_BUS_ADDR. Also add a comment about PA_VIEW and LMMIO/ELMMIO/GMMIO. Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
OpenPOWER on IntegriCloud