Nathan Scott [Thu, 12 Jan 2006 02:34:47 +0000 (13:34 +1100)]
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Nathan Scott [Wed, 11 Jan 2006 23:32:51 +0000 (10:32 +1100)]
[XFS] Fix follow_link when dealing with symlinks larger than 256 bytes.
Thanks to Yamamoto Takashi.
SGI-PV: 947953
SGI-Modid: xfs-linux-melb:xfs-kern:24962a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 23:29:53 +0000 (10:29 +1100)]
[XFS] Merge in trivial changes, sync up headers with userspace
equivalents.
SGI-PV: 907752
SGI-Modid: xfs-linux-melb:xfs-kern:24961a
Signed-off-by: Nathan Scott <nathans@sgi.com>
David Woodhouse [Wed, 11 Jan 2006 14:41:26 +0000 (14:41 +0000)]
[PATCH] fix/simplify mutex debugging code
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>
Nathan Scott [Wed, 11 Jan 2006 10:03:28 +0000 (21:03 +1100)]
[XFS] Fix compiler warnings from older gcc versions wrt printfalike
arguments.
SGI-PV: 907752
SGI-Modid: xfs-linux-melb:xfs-kern:24901a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 10:03:04 +0000 (21:03 +1100)]
[XFS] Fix some build fallout from atime changes.
SGI-PV: 946679
SGI-Modid: xfs-linux-melb:xfs-kern:24899a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Tim Shimmin [Wed, 11 Jan 2006 10:02:47 +0000 (21:02 +1100)]
[XFS] remove XFS_LOG_RES_DEBUG and turn on the res history all the time to
get more useful error info on space for trans items
SGI-PV: 947110
SGI-Modid: xfs-linux-melb:xfs-kern:24886a
Signed-off-by: Tim Shimmin <tes@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Yingping Lu [Wed, 11 Jan 2006 10:02:29 +0000 (21:02 +1100)]
[XFS] xfssyncd is responsible for flushing inode or device's data by
extracting the work from its queue. In addition, this processing also
decrement the inode's i_count. If there are any remaining works in queue
before this process terminates, we have unbalanced increment and decrement
of i_count. Thus it can cause assertion failure of vn_count. The fix
allows xyssyncd to process any remaining work before it is shutdown.
SGI-PV: 945935
SGI-Modid: xfs-linux-melb:xfs-kern:
203970a
Signed-off-by: Yingping Lu <yingping@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 09:58:44 +0000 (20:58 +1100)]
[XFS] add helper to get xfs_inode from vnode
SGI-PV: 947206
SGI-Modid: xfs-linux-melb:xfs-kern:
203960a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 09:50:22 +0000 (20:50 +1100)]
[XFS] Fix up offset type inconsistencies and gcc warnings from earlier
changes.
SGI-PV: 947038
SGI-Modid: xfs-linux-melb:xfs-kern:24875a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 09:49:57 +0000 (20:49 +1100)]
[XFS] fix up per-device xfsbufd
SGI-PV: 947098
SGI-Modid: xfs-linux-melb:xfs-kern:
203831a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 09:49:42 +0000 (20:49 +1100)]
[XFS] fix writeback control handling fix a reversed condition on where to
trylock and deal with block layer congestion properly. Patch from David
Chinner and Christoph Hellwig.
SGI-PV: 947118
SGI-Modid: xfs-linux-melb:xfs-kern:
203830a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 09:49:28 +0000 (20:49 +1100)]
[XFS] cluster rewrites We can cluster mapped pages aswell, this improves
performances on rewrites since we can reduce the number of allocator
calls.
SGI-PV: 947118
SGI-Modid: xfs-linux-melb:xfs-kern:
203829a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 09:49:16 +0000 (20:49 +1100)]
[XFS] pass full 64bit offsets to xfs_add_to_ioend
SGI-PV: 947118
SGI-Modid: xfs-linux-melb:xfs-kern:
203828a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 09:49:02 +0000 (20:49 +1100)]
[XFS] consolidate some code in xfs_page_state_convert The unmapped buffer
case is very similar to delayed and unwritten extends. Reorganize the code
to share some code for these cases.
SGI-PV: 947118
SGI-Modid: xfs-linux-melb:xfs-kern:
203827a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 09:48:47 +0000 (20:48 +1100)]
[XFS] various fixes for xfs_convert_page fix various bogusities in
handling offets From David Chinner and Christoph Hellwig
SGI-PV: 947118
SGI-Modid: xfs-linux-melb:xfs-kern:
203826a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 09:48:33 +0000 (20:48 +1100)]
[XFS] clean up the xfs_offset_to_map interface Currently we pass a struct
page and a relative offset into that page around, and returns the current
xfs_iomap_t if the block at the specified offset fits into it, or a NULL
pointer otherwise. This patch passed the full 64bit offset into the inode
that all callers have anyway, and changes the return value to a simple
boolean. Also the function gets a more descriptive name: xfs_iomap_valid.
SGI-PV: 947118
SGI-Modid: xfs-linux-melb:xfs-kern:
203825a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 09:48:14 +0000 (20:48 +1100)]
[XFS] use pagevec lookups This reduces the time spend in the radix tree
lookups and avoids unessecary look roundtrips.
SGI-PV: 947118
SGI-Modid: xfs-linux-melb:xfs-kern:
203823a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 09:47:41 +0000 (20:47 +1100)]
[XFS] Export pagevec_lookup for use on the XFS page writeout path,
for dealing with delayed allocate and unwritten extents (as well).
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
David S. Miller [Wed, 11 Jan 2006 08:15:16 +0000 (00:15 -0800)]
[MUTEX]: linux/mutex.h needs linux/linkage.h too
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Wed, 11 Jan 2006 05:31:24 +0000 (21:31 -0800)]
Merge /pub/scm/linux/kernel/git/kyle/parisc-2.6
Linus Torvalds [Wed, 11 Jan 2006 05:29:53 +0000 (21:29 -0800)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 11 Jan 2006 05:09:19 +0000 (21:09 -0800)]
x86: fix "make install" target
Removing the dependency on the boot image build was good, but it also
meant that the $< expansion by make needed to be done explicitly.
Noted by Stephen Hemminger.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David S. Miller [Wed, 11 Jan 2006 05:02:21 +0000 (21:02 -0800)]
[IPV6]: Fix modular build with netfilter enabled.
Also, drop __exit marker from ipv6_netfilter_fini() as this
can be invoked from inet6_init() error handling paths.
Based upon a report from Stephen Hemminger.
Signed-off-by: David S. Miller <davem@davemloft.net>
Christoph Hellwig [Wed, 11 Jan 2006 04:40:13 +0000 (15:40 +1100)]
[XFS] Initial pass at going directly-to-bio on the buffered IO path. This
allows us to submit much larger I/Os instead of sending down lots of small
buffer_heads. To do this we need to have a rather complicated I/O
submission and completion tracking infrastructure. Part of the latter has
been merged already a long time ago for direct I/O support. Part of the
problem is that we need to track sub-pagesize regions and for that we
still need buffer_heads for the time beeing. Long-term I hope we can move
to better data strucutures and/or maybe move this to fs/mpage.c instead of
having it in XFS. Original patch from Nathan Scott with various updates
from David Chinner and Christoph Hellwig.
SGI-PV: 947118
SGI-Modid: xfs-linux-melb:xfs-kern:
203822a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:39:08 +0000 (15:39 +1100)]
[XFS] Complete the pagebuf -> xfs_buf naming convention transition,
finally.
SGI-PV: 947038
SGI-Modid: xfs-linux-melb:xfs-kern:24866a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Yingping Lu [Wed, 11 Jan 2006 04:38:31 +0000 (15:38 +1100)]
[XFS] Fixed delayed_blks assert failure during umount. The delayed_blks
was caused by ENOSPC but not Rreclaimed by xfs_release or xfs_inactive.
The fix changed the condition in xfs_release and xfs_inactive to invoke
xfs_inactive_free_eofblocks for this special case, changed
xfs_inactive_free_eofblocks to clean the delayed blks after eof. It also
changed xfs_write to set correct eof when ENOSPC occurs.
SGI-PV: 946267
SGI-Modid: xfs-linux-melb:xfs-kern:
203788a
Signed-off-by: Yingping Lu <yingping@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
David Chinner [Wed, 11 Jan 2006 04:37:58 +0000 (15:37 +1100)]
[XFS] Introduce per-filesystem delwri pagebuf flushing to reduce
contention between filesystems and prevent deadlocks between filesystems
when a flush dependency exists between them.
SGI-PV: 947098
SGI-Modid: xfs-linux-melb:xfs-kern:24844a
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Tim Shimmin [Wed, 11 Jan 2006 04:37:38 +0000 (15:37 +1100)]
[XFS] take out the call to vn_mark_bad() used when acl inherit fails and
it needs to back out the inode creation. Tested by xfs_tests/077.
SGI-PV: 930841
SGI-Modid: xfs-linux-melb:xfs-kern:24842a
Signed-off-by: Tim Shimmin <tes@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 04:37:17 +0000 (15:37 +1100)]
[XFS] endianess annotations and tidying for the uuid code
SGI-PV: 943272
SGI-Modid: xfs-linux-melb:xfs-kern:
203709a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:37:00 +0000 (15:37 +1100)]
[XFS] Fix a thinko when generating a forced shutdown stack trace.
SGI-PV: 929558
SGI-Modid: xfs-linux-melb:xfs-kern:
203817a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Ryan Hankins [Wed, 11 Jan 2006 04:36:44 +0000 (15:36 +1100)]
[XFS] Add a stack trace in the case of xfs_forced_shutdown.
SGI-PV: 929558
SGI-Modid: xfs-linux-melb:xfs-kern:
203701a
Signed-off-by: Ryan Hankins <hankins@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:35:57 +0000 (15:35 +1100)]
[XFS] Fix quotaoff logitem for project quota, affects log recovery only.
SGI-PV: 946444
SGI-Modid: xfs-linux-melb:xfs-kern:24768a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:35:44 +0000 (15:35 +1100)]
[XFS] Add an XFS callout to security_inode_init_security; SE Linux is not
functional with XFS without this change.
SGI-PV: 946762
SGI-Modid: xfs-linux-melb:xfs-kern:24766a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:35:32 +0000 (15:35 +1100)]
[XFS] Fix v2 log bufsize reporting in /proc/mounts.
SGI-PV: 946760
SGI-Modid: xfs-linux-melb:xfs-kern:24765a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 04:35:17 +0000 (15:35 +1100)]
[XFS] fix, speedup and simplify atime handling let the VFS handle atime
updates and only sync back to the xfs inode when nessecary
SGI-PV: 946679
SGI-Modid: xfs-linux-melb:xfs-kern:
203362a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 04:34:50 +0000 (15:34 +1100)]
[XFS] turn xlog helper macros into real functions
SGI-PV: 946205
SGI-Modid: xfs-linux-melb:xfs-kern:
203360a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Eric Sandeen [Wed, 11 Jan 2006 04:34:32 +0000 (15:34 +1100)]
[XFS] remove unused vars, args, & unneeded intermediate vars from zeroing
code
SGI-PV: 946641
SGI-Modid: xfs-linux-melb:xfs-kern:
203328a
Signed-off-by: Eric Sandeen <sandeen@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Eric Sandeen [Wed, 11 Jan 2006 04:34:19 +0000 (15:34 +1100)]
[XFS] remove unused "readonly" arg from xlog_find_tail and xlog_recover
SGI-PV: 946611
SGI-Modid: xfs-linux-melb:xfs-kern:
203307a
Signed-off-by: Eric Sandeen <sandeen@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:33:51 +0000 (15:33 +1100)]
[XFS] Ensure max diosize reported is aligned with minimum diosize.
SGI-PV: 910890
SGI-Modid: xfs-linux-melb:xfs-kern:24689a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:33:36 +0000 (15:33 +1100)]
[XFS] Fix an intermittent pquota panic caused by dodgey quota flags to an
umount dquot flush call.
SGI-PV: 946444
SGI-Modid: xfs-linux-melb:xfs-kern:24680a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:33:02 +0000 (15:33 +1100)]
[XFS] Sort out cosmetic differences between user and kernel copies of some
sources.
SGI-PV: 907752
SGI-Modid: xfs-linux-melb:xfs-kern:24659a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:32:30 +0000 (15:32 +1100)]
[XFS] Make d_maxiosz report the real maximum (INT_MAX) so we dont
incorrectly limit people using this interface to size IO buffers.
SGI-PV: 910890
SGI-Modid: xfs-linux-melb:xfs-kern:24657a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:32:17 +0000 (15:32 +1100)]
[XFS] Disable write barriers for now till intermittent IO errors are
understood.
SGI-PV: 912426
SGI-Modid: xfs-linux-melb:xfs-kern:
202962a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:32:01 +0000 (15:32 +1100)]
[XFS] Reverse the sense of COMPAT_ATTR and ATTR2, keeps it simple and
consistent.
SGI-PV: 941645
SGI-Modid: xfs-linux-melb:xfs-kern:
202961a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 04:30:08 +0000 (15:30 +1100)]
[XFS] Write log dummy record when freezing filesystem
SGI-PV: 945483
SGI-Modid: xfs-linux-melb:xfs-kern:
202638a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 04:29:52 +0000 (15:29 +1100)]
[XFS] Mark some lookup tables const. Thanks to Arjan van de Ven for
spotting these.
SGI-PV: 946028
SGI-Modid: xfs-linux-melb:xfs-kern:
202617a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Yingping Lu [Wed, 11 Jan 2006 04:29:39 +0000 (15:29 +1100)]
[XFS] Fixed an assertion failure in xfs_reclaim caused by delayed block.
The assertion failure came from XFS QA41. The fix is done by enabling
truncate for delayed block in xfs_inactive.
SGI-PV: 945412
SGI-Modid: xfs-linux-melb:xfs-kern:
202521a
Signed-off-by: Yingping Lu <yingping@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 04:28:56 +0000 (15:28 +1100)]
[XFS] do barrier checks earlier. quota initialization may write to the
filesystem
SGI-PV: 912426
SGI-Modid: xfs-linux-melb:xfs-kern:
202355a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:28:45 +0000 (15:28 +1100)]
[XFS] Fix typo from when enabling write barriers by default, flags botch
in showargs.
SGI-PV: 912426
SGI-Modid: xfs-linux-melb:xfs-kern:24383a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:28:28 +0000 (15:28 +1100)]
[XFS] Implement the di_extsize allocator hint for non-realtime files as
well. Also provides a mechanism for inheriting this property from the
parent directory for new files.
SGI-PV: 945264
SGI-Modid: xfs-linux-melb:xfs-kern:24367a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Nathan Scott [Wed, 11 Jan 2006 04:27:50 +0000 (15:27 +1100)]
[XFS] Do not inherit properties for the quota inodes from the root inode.
SGI-PV: 945264
SGI-Modid: xfs-linux-melb:xfs-kern:24366a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 04:27:18 +0000 (15:27 +1100)]
[XFS] enable write barriers by default
SGI-PV: 912426
SGI-Modid: xfs-linux-melb:xfs-kern:
201981a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 04:23:43 +0000 (15:23 +1100)]
[XFS] merge xfs_arch.h userspace changes back
SGI-PV: 907752
SGI-Modid: xfs-linux-melb:xfs-kern:
201882a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Christoph Hellwig [Wed, 11 Jan 2006 04:22:04 +0000 (15:22 +1100)]
[XFS] remove over-eager assert
SGI-PV: 941804
SGI-Modid: xfs-linux-melb:xfs-kern:
201702a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Linus Torvalds [Wed, 11 Jan 2006 03:35:19 +0000 (19:35 -0800)]
Fix net/core/wireless.c link failure
It needs <linux/etherdevice.h> for compare_ether_addr()
Matthew Wilcox [Wed, 11 Jan 2006 01:48:07 +0000 (20:48 -0500)]
[PARISC] Use STABS_DEBUG macro from vmlinux.lds.h
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>
Matthew Wilcox [Wed, 11 Jan 2006 01:48:06 +0000 (20:48 -0500)]
[PARISC] Fix Dino reporting on J2240
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>
Helge Deller [Wed, 11 Jan 2006 01:48:05 +0000 (20:48 -0500)]
[PARISC] stifb: Remove obsolete MODULE_PARM()
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>
Helge Deller [Wed, 11 Jan 2006 01:48:04 +0000 (20:48 -0500)]
[PARISC] stifb: Fix framebuffer console at 32bpp
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>
Helge Deller [Wed, 11 Jan 2006 01:48:03 +0000 (20:48 -0500)]
[PARISC] stifb: use F_EXTEND macro
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>
Alexey Dobriyan [Wed, 11 Jan 2006 01:48:02 +0000 (20:48 -0500)]
[PARISC] Use C99 initializers in asm-parisc/processor.h
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>
Thibaut VARENE [Wed, 11 Jan 2006 01:48:01 +0000 (20:48 -0500)]
[PARISC] pdc_stable: More robust sysfs error checking
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>
Grant Grundler [Wed, 11 Jan 2006 01:48:00 +0000 (20:48 -0500)]
[PARISC] Make PCI_HOST_ADDR and PCI_BUS_ADDR symmetrical
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>
Guy Martin [Wed, 11 Jan 2006 01:47:59 +0000 (20:47 -0500)]
[PARISC] Fix parport_gsc by selecting PARPORT_NOT_PC
PARPORT_GSC requires selecting PARPORT_NOT_PC in order to
work properly.
Signed-off-by: Guy Martin <gmsoft@tuxicoman.be>
Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Stuart Brady [Wed, 11 Jan 2006 01:47:58 +0000 (20:47 -0500)]
[PARISC] OSS: Fix build of parisc harmony driver
OSS Harmony got missed on the conversion of parisc_device.hpa to a
struct resource... fix its build.
Signed-off-by: Stuart Brady <sdb@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Grant Grundler [Wed, 11 Jan 2006 01:47:57 +0000 (20:47 -0500)]
[PARISC] Fix BLK_BOUNCE_HIGH on parisc by initializing max_low_pfn
max_low_pfn was not being set in arch/parisc/mm/init.c, causing severe
problems whenever anything tried to use BLK_BOUNCE_HIGH. Set it to
max_pfn like other similar architectures do.
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Grant Grundler [Wed, 11 Jan 2006 01:47:56 +0000 (20:47 -0500)]
[PARISC] Truncate overlapping PAT PDC reported ranges
Deal with overlapping LBA MMIO resources,
rp3440 PDC BUG: PDC reports lmmio range for the last rope that overlaps
with the CPU HPA. Console output was:
...
Found devices:
1. Storm Peak Fast at 0xfffffffffe798000 [152] { 0, 0x0, 0x889, 0x00004 }
2. Storm Peak Fast at 0xfffffffffe799000 [153] { 0, 0x0, 0x889, 0x00004 }
...
FAILED: lba_fixup_bus() request for lmmio_space
[
fffffffff0000000/
fffffffffecffffe]
Output is now:
LBA: Truncating lmmio_space [
fffffffff0000000/
fffffffffecffffe] to
[
fffffffff0000000,
fffffffffe797fff]
My only concern with this patch is how C8000 (PAT PDC) will report
elmmio ranges when a gfx card is installed. I'll have to test this
another day.
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: James Bottomley <jejb@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Alexey Dobriyan [Wed, 11 Jan 2006 01:47:56 +0000 (20:47 -0500)]
[PARISC] Add __iomem to __raw_check_addr()
Add __iomem to __raw_check_addr(), which nukes ~13809 sparse
warnings on allmodconfig.
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>
Helge Deller [Wed, 11 Jan 2006 01:47:55 +0000 (20:47 -0500)]
[PARISC] Add some defines for HugeTLB pages
Define some constants for HugeTLB pages, not that parisc-linux supports
it yet.
Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Helge Deller [Wed, 11 Jan 2006 01:47:54 +0000 (20:47 -0500)]
[PARISC] Introduce DINO_LOCAL_IRQS and use it for gsc_find_local_irq
Fix dino by using DINO_LOCAL_IRQS as the limit for gsc_find_local_irq()
instead of the irq itself.
Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Matthew Wilcox [Wed, 11 Jan 2006 01:47:53 +0000 (20:47 -0500)]
[PARISC] Fix GSC graphics cards with 64MB regions
Make knapps work with its 64MB gfx card. I probably just broke another
machine in the process, but assuming 64MB when 64MB aligned is probably
safer than assuming 32MB all the time.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Kyle McMartin [Wed, 11 Jan 2006 01:47:52 +0000 (20:47 -0500)]
[PARISC] Fix and cleanup ioremap.c to work with 4level-fixup.h
Fixup ioremap a bit. It seems to work on 32-bit kernels, but fails
miserably on the first ioremapped access on 64-bit kernels. Also, having
STI enabled causes it to fail. Probably because we're passing an ioremapped
region to a real-mode STI call...
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Alexey Dobriyan [Wed, 11 Jan 2006 01:47:51 +0000 (20:47 -0500)]
[PARISC] Add __user annotation to eisa_eeprom.c
Annotate eisa_eeprom_read() with __user.
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>
Helge Deller [Wed, 11 Jan 2006 01:47:50 +0000 (20:47 -0500)]
[PARISC] Fix Cirrus 6832 Cardbus on RDI Tadpole PARISC Laptop
Fix irq-off-by-one for Cirrus 6832 Cardbus on RDI Tadpole PARISC Laptop.
We just DECLARE_PCI_FIXUP_ENABLE as it is unlikely that this will be
found in any other parisc system.
Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Matthew Wilcox [Wed, 11 Jan 2006 01:47:49 +0000 (20:47 -0500)]
[PARISC] Make local cache flushes take a void *
Make flush_data_cache_local, flush_instruction_cache_local and
flush_tlb_all_local take a void * so they don't have to be cast
when using on_each_cpu(). This becomes a problem when on_each_cpu
is a macro (as it is in current -mm).
Also move the prototype of flush_tlb_all_local into tlbflush.h and
remove its declaration from .c files.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Helge Deller [Wed, 11 Jan 2006 01:35:03 +0000 (20:35 -0500)]
[PARISC] Add __read_mostly section for parisc
Flag a whole bunch of things as __read_mostly on parisc. Also flag a few
branches as unlikely() and cleanup a bit of code.
Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Nicolas Kaiser [Wed, 11 Jan 2006 01:10:28 +0000 (02:10 +0100)]
fs/proc/vmcore.c: header included twice
Header included twice.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Nicolas Kaiser [Wed, 11 Jan 2006 01:08:57 +0000 (02:08 +0100)]
fs/attr.c: header included twice
Header included twice.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Nicolas Kaiser [Wed, 11 Jan 2006 01:07:34 +0000 (02:07 +0100)]
asm-powerpc: header included twice
Header included twice.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Nicolas Kaiser [Wed, 11 Jan 2006 01:06:20 +0000 (02:06 +0100)]
xfs: header included twice
Header included twice.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Nicolas Kaiser [Wed, 11 Jan 2006 01:04:35 +0000 (02:04 +0100)]
netfilter: headers included twice
Headers included twice.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Paul Jackson [Wed, 11 Jan 2006 01:01:38 +0000 (02:01 +0100)]
cpuset two little doc fixes
Two little cpuset documentation fixes.
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Adrian Bunk [Wed, 11 Jan 2006 01:00:10 +0000 (02:00 +0100)]
drivers/net/gianfar_sysfs.c: update email address of Kumar Gala
drivers/net/gianfar_sysfs.c still contained the old email address
of Kumar Gala.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Jesper Juhl [Wed, 11 Jan 2006 00:52:40 +0000 (01:52 +0100)]
add loglevel to printk in fs/afs/cmservice.c
This is a small patch that adds loglevel to a printk in
fs/afs/cmservice.c
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Jesper Juhl [Wed, 11 Jan 2006 00:51:26 +0000 (01:51 +0100)]
missing printk loglevel and tiny tiny whitespace change in binfmt_elf()
Patch adds a mising printk loglevel (I think KERN_WARNING is appropriate
here) in fs/binfmt_elf.c, and while I was there I made some tiny tiny tiny
adjustments to whitespacing in the neighborhood.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Jesper Juhl [Wed, 11 Jan 2006 00:50:28 +0000 (01:50 +0100)]
add missing printk loglevel in mm/swapfile.c
in mm/swapfile.c a printk() is missing a loglevel. I believe the proper
loglevel for this situation is KERN_ERR, so that's what the patch below
sets -if you agree, please apply.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Jesper Juhl [Wed, 11 Jan 2006 00:48:08 +0000 (01:48 +0100)]
Tiny esthetic changes to Documentation/laptop-mode.txt
Here's a tiny patch making a few esthetic changes to
Documentation/laptop-mode.txt
To me this patch makes sense, but feel free to disagree, I don't feel
strongly about it at all.
It changes a single URL to its strictly correct form (directories should
end in /), and it makes the arguments to main in an included example
program follow convention and be named argc and argv.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Adrian Bunk [Wed, 11 Jan 2006 00:43:01 +0000 (01:43 +0100)]
MAINTAINERS: sh: update the mailing list
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Luiz Fernando Capitulino [Wed, 11 Jan 2006 00:38:27 +0000 (01:38 +0100)]
ext2: trivial indentation fix.
This memset() line was indented with seven spaces, this patch fixes
it to use a tab instead. Yes, very trivial but it's the third time
I have to look at this line..
Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Ingo Molnar [Tue, 10 Jan 2006 22:15:02 +0000 (23:15 +0100)]
[PATCH] mutex: trivial whitespace cleanups
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Tue, 10 Jan 2006 21:44:43 +0000 (13:44 -0800)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
Ingo Molnar [Tue, 10 Jan 2006 21:10:36 +0000 (22:10 +0100)]
[PATCH] mark mutex_lock*() as might_sleep()
Mark mutex_lock() and mutex_lock_interruptible() as might_sleep()
functions.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ingo Molnar [Tue, 10 Jan 2006 21:07:44 +0000 (22:07 +0100)]
[PATCH] fix i386 mutex fastpath on FRAME_POINTER && !DEBUG_MUTEXES
Call the mutex slowpath more conservatively - e.g. FRAME_POINTERS can
change the calling convention, in which case a direct branch to the
slowpath becomes illegal. Bug found by Hugh Dickins.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ingo Molnar [Tue, 10 Jan 2006 20:48:59 +0000 (15:48 -0500)]
[PATCH] remove unnecessary asm/mutex.h from kernel/mutex-debug.c
Remove unnecessary (and incorrect) inclusion of asm/mutex.h, pointed out
by David Howells.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bart De Schuymer [Tue, 10 Jan 2006 21:12:22 +0000 (13:12 -0800)]
[EBTABLES] Don't match tcp/udp source/destination port for IP fragments
Signed-off-by: Bart De Schuymer <bdschuym@pandora.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
Adrian Bunk [Tue, 10 Jan 2006 21:11:44 +0000 (13:11 -0800)]
[IRDA] DONGLE_OLD: remove dependency on non-existing symbol
Jean-Luc Leger <reiga@dspnet.fr.eu.org> reported this alternative
dependency on a non-existing symbol.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Adrian Bunk [Tue, 10 Jan 2006 21:10:02 +0000 (13:10 -0800)]
[IRDA]: kill drivers/net/irda/sir_core.c
EXPORT_SYMBOL's do nowadays belong to the files where the actual
functions are.
Moving the module_init/module_exit to the file with the actual functions
has the advantage of saving a few bytes due to the removal of two
functions.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jesper Juhl [Tue, 10 Jan 2006 21:09:01 +0000 (13:09 -0800)]
[ATM]: Remove unneeded kmalloc() return value casts + tiny whitespace cleanup
Small cleanups for drivers/atm/zatm.c
Get rid of unneeded cast of kmalloc() return value.
Small whitespace/CodingStyle/formatting cleanup (since I was in there anyway).
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jesper Juhl [Tue, 10 Jan 2006 21:08:21 +0000 (13:08 -0800)]
[NET]: Remove unneeded kmalloc() return value casts
Get rid of needless casting of kmalloc() return value in net/
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>