aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge git://oak/home/sfr/kernels/iseries/workPaul Mackerras2005-11-03
|\
| * powerpc: merge ucontext.hStephen Rothwell2005-11-03
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * powerpc: merge sigcontext.hStephen Rothwell2005-11-03
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * 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>
| * powerpc: merge ptrace.hStephen Rothwell2005-11-03
| | | | | | | | | | | | Move struct ptregs32 into asm-ppc64/ppc32.h Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * powerpc: merge stat.hStephen Rothwell2005-11-03
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | [PATCH] powerpc: Keep fixing merged ipcbuf.hDavid Gibson2005-11-03
| | | | | | | | | | | | | | | | | | | | | | Oops, replacing the two u64s in struct ipc64_perm with __u32s changed the alignment of that structure, which could mess up userspace. Revert to using two unsigned long longs (which is what ppc32 had originally). ppc64 orignally had two unsigned longs, but long long is the same size on 64 bit, so this should be ok there too. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [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: Fix harmless warning in 8xx_io/commproc.cMarcelo Tosatti2005-11-03
| | | | | | | | 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>
| * [PATCH] powerpc: Merge (move) numnodes.h and sparsemem.hDavid Gibson2005-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | The ppc64 versions of numnodes.h and sparsemem.h can be safely moved to asm-powerpc with no changes apart from changing the #define to the standard _ASM_POWERPC_ form. There are no ppc32 versions of these files, because they only have any effect if CONFIG_SPARSEMEM is enabled, which it never can be on ppc32. Built and booted on pSeries (POWER5), built for 32-bit powermac. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * Merge ../linux-2.6Paul Mackerras2005-11-01
| |\
| | * Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6Linus Torvalds2005-11-01
| | |\
| | | * Merge branch 'master' of /home/src/linux-2.6/Anton Altaparmakov2005-11-01
| | | |\
| | | * | NTFS: Fix a stupid bug causing writes to non-initialized pages to segfault.Anton Altaparmakov2005-11-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | * | | Don't touch USB controller IO registers when they are disabledLinus Torvalds2005-11-01
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The USB "handoff" code is an early PCI quirk to make sure we own the USB controller (as opposed to the BIOS/SMM). But if the controller isn't even enabled yet, don't try to access it. Acked-by: Paul Mackerras <paulus@samba.org> (who had an alternate patch) Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * | Revert "i386: move apic init in init_IRQs"Linus Torvalds2005-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f2b36db692b7ff6972320ad9839ae656a3b0ee3e causes a bootup hang on at least one machine. Revert for now until we understand why. The old code may be ugly, but it works. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * | [PATCH] Creative Audigy 2 cardbus: Add IO window wakeup magicJames Courtier-Dutton2005-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the magic IO wakeup code for the CardBus version of the Creative Labs Audigy 2 to the snd-emu10k1 driver. Without the magic IO enable sequence, reading from the IO region of the card will fail spectacularly, and the machine will hang. My next task will be getting the driver to actually play sound without distortion. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> [ This is a work-in-progress, but since it avoids a total lockup if the emu10k module is loaded on a machine with the cardbus card inserted, we're better off with it than without it, even if sound quality is bad right now ] Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * | [PATCH] fix __writeback_single_inode WARN_ONAndrea Arcangeli2005-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the inode count is zero in inode writeback, the WARN_ON(!(inode->i_state & I_WILL_FREE)); is broken, and needs to test for either I_WILL_FREE|I_FREEING. When the inode is in I_FREEING state, it's already out of the visibility of the vm so it can't be freed so it doesn't require the __iget and the generic_delete_inode path can call the sync internally to the lowlevel fs callback during the last iput. So the inode being in I_FREEING is also a valid condition for calling the sync with i_count == 0. The specific stack trace is this: 0xc00000007b8fb6e0 0xc00000000010118c .__writeback_single_inode +0x5c 0xc00000007b8fb6e0 0xc0000000001014dc (lr) .sync_inode +0x3c 0xc00000007b8fb790 0xc0000000001014dc .sync_inode +0x3c 0xc00000007b8fb820 0xc0000000001a5020 .ext2_sync_inode +0x64 0xc00000007b8fb8f0 0xc0000000001a65b4 .ext2_truncate +0x3f8 0xc00000007b8fba40 0xc0000000001a6940 .ext2_delete_inode +0xdc 0xc00000007b8fbac0 0xc0000000000f7a5c .generic_delete_inode +0x124 0xc00000007b8fbb50 0xc0000000000f5fe0 .iput +0xb8 0xc00000007b8fbbe0 0xc0000000000e9fd4 .sys_unlink +0x2a8 0xc00000007b8fbd10 0xc00000000001048c .ret_from_syscall_1 +0x0 Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * | [PATCH] revert ide-scsi highmem cleanupAndrew Morton2005-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jeff Garzik <jgarzik@pobox.com> points out that this was wrong: we need to disable local interrupts while holding KM_IRQ0 due to IRQ sharing. And holding interrupts off during a big PIO opration is expensive, so we only want to do that if we know the page was highmem. So revert commit 17fd47ab4d33e764216b87006d8118fa050b4c92 Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * | [PATCH] i386: CONFIG_PC removalArthur Othieno2005-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_PC is left-over cruft after the introduction of CONFIG_X86_PC with the subarch split. Remove it, and fixup the remaining users to depend on CONFIG_X86_PC instead. Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * | [PATCH] noop-iosched: avoid corrupted request mergingJens Axboe2005-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tejun Heo notes: "I'm currently debugging this. The problem is that we are using the generic dispatch queue directly in the noop sched and merging is NOT allowed on dispatch queues but generic handling of last_merge tries to merge requests. I'm still trying to verify this, so I'll be back with results soon." In the meantime, disable merging for noop by setting REQ_NOMERGE in elevator_noop_add_request(). Eventually, we should add a noop_list and do the dispatching like in the other io schedulers. Merging is still beneficial for noop (and it has always done it). Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * | [PATCH] Fix on-the-fly switch from cfq i/o schedulerJens Axboe2005-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't clear ->elevator_data on exit, if we are switching queues we are overwriting the data of the new io scheduler. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6Linus Torvalds2005-10-31
| | |\|
| | | * Merge branch 'master' of /usr/src/ntfs-2.6/Anton Altaparmakov2005-10-31
| | | |\
| | | * \ Merge branch 'master' of /usr/src/ntfs-2.6/Anton Altaparmakov2005-10-30
| | | |\ \
| | | * \ \ Merge branch 'master' of /usr/src/ntfs-2.6/Anton Altaparmakov2005-10-24
| | | |\ \ \
| | | * | | | NTFS: Document extended attribute ($EA) NEED_EA flag. (Based on libntfsAnton Altaparmakov2005-10-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch by Yura Pakhuchiy.) Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | | * | | | NTFS: Fix compilation warnings with gcc-4.0.2 on SUSE 10.0.Anton Altaparmakov2005-10-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | | * | | | NTFS: Use %z for size_t to fix compilation warnings. (Andrew Morton)Anton Altaparmakov2005-10-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | | * | | | NTFS: Fix serious data corruption issue when writing.Anton Altaparmakov2005-10-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many thanks to Alberto Patino for testing and reporting the data corruption. And many apologies for corrupting his partition. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | | * | | | NTFS: $EA attributes can be both resident non-resident.Anton Altaparmakov2005-10-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor tidying. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | | * | | | Merge branch 'master' of /usr/src/ntfs-2.6/Anton Altaparmakov2005-10-19
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of /usr/src/ntfs-2.6/Anton Altaparmakov2005-10-17
| | | |\ \ \ \ \
| | | * | | | | | NTFS: The big ntfs write(2) rewrite has arrived. We now implement our ownAnton Altaparmakov2005-10-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file operations ->write(), ->aio_write(), and ->writev() for regular files. This replaces the old use of generic_file_write(), et al and the address space operations ->prepare_write and ->commit_write. This means that both sparse and non-sparse (unencrypted and uncompressed) files can now be extended using the normal write(2) code path. There are two limitations at present and these are that we never create sparse files and that we only have limited support for highly fragmented files, i.e. ones whose data attribute is split across multiple extents. When such a case is encountered, EOPNOTSUPP is returned. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | | * | | | | | NTFS: Remove address space operations ->prepare_write and ->commit_write inAnton Altaparmakov2005-10-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preparation for the big rewrite of write(2) support in ntfs. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | | * | | | | | NTFS: In attrib.c::ntfs_attr_set() call balance_dirty_pages_ratelimited()Anton Altaparmakov2005-10-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and cond_resched() in the main loop as we could be dirtying a lot of pages and this ensures we play nice with the VM and the system as a whole. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| | | * | | | | | Merge branch 'master' of /usr/src/ntfs-2.6/Anton Altaparmakov2005-10-11
| | | |\ \ \ \ \ \
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-05 04:25:16 -0400