user/sven/linux-bitkeeper.git/include, branch master

Merge bk://kernel.bkbits.net/davem/net-2.6

2005-04-04T00:46:46Z

into ppc970.osdl.org:/home/torvalds/v2.6/linux

[PATCH] ext3: move goal logical block into block allocation info structure

2005-04-04T00:39:47Z

Moved i_next_alloc_block and i_next_goal_block out from ext3_inod_info, and put it together with the reservation structure into the ext3_block_alloc_info structure, and dynamically allocate that structure whenever need to allocation a block. This is also apply for noreservation mount. Also cleanup ext3_find_goal() code. Signed-off-by: Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

[PATCH] ext3: reservation info cleanup: remove rsv_seqlock

2005-04-04T00:39:31Z

Since now the ei->truncate_sem is guarding the concurrent allocation and the deallocation, there is no need to use the the rsv_seqlock lock in the ext3_reserve_window_node, which was there to protect using/allocating reservation window race between two threads allocating blocks at the same time. Signed-off-by: Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

[PATCH] ext3: dynamic allocation of block reservation info

2005-04-04T00:39:16Z

Right now the ext3 reservation structure(ext3_reserve_window_node) is part of the ext3 inode itself. This part of information is only needed for files that need allocate blocks on disk. So, the attached patches reduce the ext3 inode size by dynamically allocating the block allocation/reservation info structure(called struct ext3_block_alloc_info) when it is needed(i.e. only for files who need to allocate blocks) The reservation structure is being allocated and linked to the ext3 inode at ext3_get_block_handle(), and being freed and unlinked at the iput_final->ext3_clear_inode(). The ei->truncate_sem which is currently used to protect concurrent ext3_get_block() and ext3_truncate is used to protect reservation structure allocation and deallocation. Signed-off-by: Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

[PATCH] ppc64: add definition for PAGE_AGP

2005-04-04T00:38:42Z

This fix DRM build on ppc64 (even if DRM here is not yet functional, you'll need the bleeding edge r300 stuff) by properly defining PAGE_AGP for the ppc64 architecture. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

[PATCH] ppc32: clean up arch/ppc/syslib/prom_init.c

2005-04-04T00:38:10Z

The call_prom routine in arch/ppc/syslib/prom_init.c, which does a client call to Open Firmware, returns a void *, and we use void * for instance handles and package handles that are returned from and used in OF calls. This is a bad idea - we can't ever dereference those things, and we end up with a lot of casts because arguments to and return values from OF calls are sometimes handles and sometimes numbers. This patch cleans things up by using u32 as the type for OF handles. The return type of call_prom becomes int because the return value from an OF call is often an int status code. The number of casts in prom_init.c is reduced substantially by this patch. Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

[PATCH] ppc32: add syscall6 definition

2005-04-04T00:37:53Z

Since we have some syscalls with 6 arguments, it's useful to have a definition of _syscall6 in asm-ppc/unistd.h. This patch adds a suitable definition. Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

[PATCH] BDI: Improve nommu mmap support

2005-04-04T00:36:18Z

The attached patch improves nommu mmap support; particularly in terms on supporting private mappings. It does this by examining the device capability mask now in the backing_dev_info structure. Private mappings will now be backed by the underlying device directly if possible, where "possible" is constrained by the protection mask parameter and the device capabilities mask. I've also split the do_mmap_pgoff() function contents into a number of auxilliary functions to make it easier to understand. The documentation is also updated; including the addition of a warning about permitting direct mapping of flash chips and the problems of XIP vs write. Signed-Off-By: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

Merge bk://bart.bkbits.net/ide-2.6

2005-04-03T13:02:24Z

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial

2005-04-03T12:40:47Z

into ppc970.osdl.org:/home/torvalds/v2.6/linux