summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ↵Linus Torvalds2007-07-174-156/+150
|\ | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SERIAL] SUNHV: Fix jerky console on LDOM guests. [SPARC64]: Fix race between MD update and dr-cpu add. [SPARC64]: SMP build fix.
| * [SERIAL] SUNHV: Fix jerky console on LDOM guests.David S. Miller2007-07-171-11/+1
| | | | | | | | | | | | | | | | Mixing putchar() and write() hvcalls does not work %100 correctly. But we should be using write() all the time if we can, even from ->start_tx(), anyways. Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SPARC64]: Fix race between MD update and dr-cpu add.David S. Miller2007-07-172-143/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to make sure the MD update occurs before we try to process dr-cpu configure requests. MD update and dr-cpu were being processed by seperate threads so that did not happen occaisionally. Fix this by executing all domain services data packets from a single thread, in order. This will help simplify some other things as well. Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SPARC64]: SMP build fix.Fabio Massimo Di Nitto2007-07-171-2/+2
| | | | | | | | | | | | The UP build fix had some unintended consequences. Signed-off-by: David S. Miller <davem@davemloft.net>
* | [HRTIMER] Fix cpu pointer arg to clockevents_notify()David Miller2007-07-171-1/+1
|/ | | | | | | | | | | All of the clockevent notifiers expect a pointer to an "unsigned int" cpu argument, but hrtimer_cpu_notify() passes in a pointer to a long. [ Discussed with and ok by Thomas Gleixner ] Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Make BLK_DEV_BSG depend strictly on SCSI=yLinus Torvalds2007-07-171-1/+1
| | | | | | | | | | | | | The SCSI code can be compiled modular, but BLK_DEV_BSG currently cannot, and depends on the SCSI layer. So make sure that it depends on the SCSI layer being compiled in, not just available as a module. Noticed by Jeff Garzik and S.Çağlar Onur. Cc: Jeff Garzik <jeff@garzik.org> Cc: Jens Axboe <jens.axboe@oracle.com> Cc: S.Çağlar Onur <caglar@pardus.org.tr> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Make check_signature depend on CONFIG_HAS_IOMEMLinus Torvalds2007-07-171-2/+2
| | | | | | | | | | | This should avoid build problems on architectures without a "readb()", that got bitten by check_signature() being uninlined. Noted by Heiko Carstens. Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Revert "[NET]: Fix races in net_rx_action vs netpoll."Linus Torvalds2007-07-162-18/+0
| | | | | | | | | | | | | | This reverts commit 29578624e354f56143d92510fff33a8b2aaa2c03. Ingo Molnar reports complete breakage with his e1000 card (no networking, card reports transmit timeouts), and bisected it down to this commit. Let's figure out what went wrong, but not keep breaking machines until we do. Cc: Ingo Molnar <mingo@elte.hu> Cc: Olaf Kirch <olaf.kirch@oracle.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'drm-patches' of ↵Linus Torvalds2007-07-1677-2214/+2485
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: remove core typedefs from the ioc32 wrappers drm: remove sarea typedefs drm: detypedef the hashtab and more of sman drm: de-typedef sman drm: detypedeffing continues... drm: detypef waitlist/freelist/buf_entry/device_dma/drm_queue structs drm: drop drm_vma_entry_t, drm_magic_entry_t drm: drop drm_buf_t typedef drm: fixup other drivers for typedef removals drm: remove drm_file_t, drm_device_t and drm_head_t typedefs drm: remove a bunch of typedefs on the userspace interface r300: updates register header radeon: add support for vblank on crtc2 drm: cleanup list initialisation drm: fix typo on code drm getsarea drm: remove DRM_GETSAREA and replace with drm_getsarea function drm: cleanup use of Linux list handling macros
| * drm: remove core typedefs from the ioc32 wrappersDave Airlie2007-07-161-41/+41
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: remove sarea typedefsDave Airlie2007-07-122-9/+15
| | | | | | | | | | | | Leave the userspace typedefs in place Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: detypedef the hashtab and more of smanDave Airlie2007-07-128-59/+59
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: de-typedef smanDave Airlie2007-07-126-49/+51
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: detypedeffing continues...Dave Airlie2007-07-1123-142/+143
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: detypef waitlist/freelist/buf_entry/device_dma/drm_queue structsDave Airlie2007-07-1116-80/+81
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: drop drm_vma_entry_t, drm_magic_entry_tDave Airlie2007-07-115-19/+15
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: drop drm_buf_t typedefDave Airlie2007-07-1120-104/+104
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fixup other drivers for typedef removalsDave Airlie2007-07-1122-296/+296
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: remove drm_file_t, drm_device_t and drm_head_t typedefsDave Airlie2007-07-1142-432/+432
| | | | | | | | | | | | some drivers still todo. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: remove a bunch of typedefs on the userspace interfaceDave Airlie2007-07-1125-320/+367
| | | | | | | | | | | | | | This moves a bunch of typedefs into a !defined __KERNEL__ to keep userspace API compatiblity, it changes all internal usages to structs/enum/unions. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * r300: updates register headerOliver McFadden2007-07-112-506/+698
| | | | | | | | | | | | | | This updates the R300 register names and allows the VAP_PVS_WAITIDLE register to be written. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * radeon: add support for vblank on crtc2Dave Airlie2007-07-116-14/+124
| | | | | | | | | | | | This adds support for CRTC2 vblank on radeon similiar to the i915. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: cleanup list initialisationDave Airlie2007-07-112-5/+4
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: fix typo on code drm getsareaDave Airlie2007-07-111-1/+1
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: remove DRM_GETSAREA and replace with drm_getsarea functionDave Airlie2007-07-119-26/+22
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: cleanup use of Linux list handling macrosDave Airlie2007-07-1118-195/+116
| | | | | | | | | | | | | | | | This makes the drms use of the list handling macros a lot cleaner and more along the lines of how they should be used and uses them in some more places. Signed-off-by: Dave Airlie <airlied@linux.ie>
* | utime(s): Honour CAP_FOWNER when times==NULLSatyam Sharma2007-07-161-1/+1
| | | | | | | | | | | | | | | | do_utimes() does not honour CAP_FOWNER when times==NULL. Trivial and obvious one-line fix. Signed-off-by: Satyam Sharma <ssatyam@cse.iitk.ac.in> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Fix too few arguments to function `scsi_cmd_ioctl'S.Çağlar Onur2007-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This corrects the following compile error introduced by the merge of the new bsg layer in commit e245befce7af0a1e1347079ed62695b059594bd4: caglar@zangetsu linux-2.6 $ make CHK include/linux/version.h CHK include/linux/utsrelease.h CALL scripts/checksyscalls.sh CHK include/linux/compile.h LD drivers/block/built-in.o CC [M] drivers/block/cciss.o drivers/block/cciss.c: In function `cciss_ioctl': drivers/block/cciss.c:1173: warning: passing arg 2 of `scsi_cmd_ioctl' from incompatible pointer type drivers/block/cciss.c:1173: warning: passing arg 3 of `scsi_cmd_ioctl' makes pointer from integer without a cast drivers/block/cciss.c:1173: warning: passing arg 4 of `scsi_cmd_ioctl' makes integer from pointer without a cast drivers/block/cciss.c:1173: error: too few arguments to function `scsi_cmd_ioctl' ... make[2]: *** [drivers/block/cciss.o] Hata 1 make[1]: *** [drivers/block] Hata 2 make: *** [drivers] Hata 2 Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr> Cc: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Fix LDM for new field in the VOL5 VBLK.Anton Altaparmakov2007-07-162-46/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach LDM about a new field encountered with Windows Vista. This fixes LDM for people using Vista who have disabled drive letter assignment from one or more volumes. Doing this introduces a so far unknown field in the LDM database in the VOL5 VBLK structure which causes the LDM driver to fail to parse the VBLK structure and hence LDM fails to parse the disk altogether. This patch teaches the driver about this field. Thanks got to Ashton Mills <amills@iinet.com.au> for reporting the problem and working with me on getting it fixed. It is now working for him. Signed-off-by: Anton Altaparmakov <aia21@cantab.net> CC: Richard Russon <ldm@flatcap.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Remove duplicate comments from sysctl.cLinus Torvalds2007-07-161-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Randy Dunlap noticed that the recent comment clarifications from Andrew had somehow gotten duplicated. Quoth Andrew: "hm, that could have been some late-night reject-fixing." Fix it up. Cc: From: Andrew Morton <akpm@linux-foundation.org> Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Fix new generic block device SG compileLinus Torvalds2007-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | We had a merge issue with the "dentry" field going away from the kobject, and being replaced by a sysfs_dirent field (named "sd") instead. That broke the BSG compile. Cc: Jens Axboe <jens.axboe@oracle.com> Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-schedLinus Torvalds2007-07-162-36/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: [PATCH] sched: fix up fs/proc/array.c whitespace problems [PATCH] sched: prettify prio_to_wmult[] [PATCH] sched: document prio_to_wmult[] [PATCH] sched: improve weight-array comments [PATCH] sched: remove dead code from task_stime() Fixed up trivial conflict in fs/proc/array.c
| * | [PATCH] sched: fix up fs/proc/array.c whitespace problemsIngo Molnar2007-07-161-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while changing task_stime() i noticed a whitespace style problem in array.c - fix it. While at it, fix all the other style problems too, most of them in the scheduler-stats related portions of array.c. There is no change in functionality: text data bss dec hex filename 4356 28 0 4384 1120 array.o-before 4356 28 0 4384 1120 array.o-after Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * | [PATCH] sched: prettify prio_to_wmult[]Ingo Molnar2007-07-161-8/+8
| | | | | | | | | | | | | | | | | | prettify the prio_to_wmult[] array. (this could have saved us from the typos) Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * | [PATCH] sched: document prio_to_wmult[]Ingo Molnar2007-07-161-0/+7
| | | | | | | | | | | | | | | | | | document prio_to_wmult[]. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * | [PATCH] sched: improve weight-array commentsIngo Molnar2007-07-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | improve the comments around the wmult array (which controls the weight of niced tasks). Clarify that to achieve a 10% difference in CPU utilization, a weight multiplier of 1.25 has to be used. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * | [PATCH] sched: remove dead code from task_stime()Ingo Molnar2007-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Alexey Dobriyan noticed that task_stime() contains a piece of dead code. (which is a remnant of earlier versions of this code) Remove that code. Signed-off-by: Ingo Molnar <mingo@elte.hu>
* | | Merge branch 'upstream-linus' of ↵Linus Torvalds2007-07-1639-1054/+4623
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (32 commits) [PATCH] ocfs2: zero_user_page conversion ocfs2: Support xfs style space reservation ioctls ocfs2: support for removing file regions ocfs2: update truncate handling of partial clusters ocfs2: btree support for removal of arbirtrary extents ocfs2: Support creation of unwritten extents ocfs2: support writing of unwritten extents ocfs2: small cleanup of ocfs2_write_begin_nolock() ocfs2: btree changes for unwritten extents ocfs2: abstract btree growing calls ocfs2: use all extent block suballocators ocfs2: plug truncate into cached dealloc routines ocfs2: simplify deallocation locking ocfs2: harden buffer check during mapping of page blocks ocfs2: shared writeable mmap ocfs2: factor out write aops into nolock variants ocfs2: rework ocfs2_buffered_write_cluster() ocfs2: take ip_alloc_sem during entire truncate ocfs2: Add "preferred slot" mount option [KJ PATCH] Replacing memset(<addr>,0,PAGE_SIZE) with clear_page() in fs/ocfs2/dlm/dlmrecovery.c ...
| * | | [PATCH] ocfs2: zero_user_page conversionEric Sandeen2007-07-111-11/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: Support xfs style space reservation ioctlsMark Fasheh2007-07-116-16/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We re-use the RESVSP/UNRESVSP ioctls from xfs which allow the user to allocate and deallocate regions to a file without zeroing data or changing i_size. Though renamed, the structure passed in from user is identical to struct xfs_flock64. The three fields that are actually used right now are l_whence, l_start and l_len. This should get ocfs2 immediate compatibility with userspace software using the pre-existing xfs ioctls. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: support for removing file regionsMark Fasheh2007-07-114-12/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide an internal interface for the removal of arbitrary file regions. ocfs2_remove_inode_range() takes a byte range within a file and will remove existing extents within that range. Partial clusters will be zeroed so that any read from within the region will return zeros. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: update truncate handling of partial clustersMark Fasheh2007-07-113-46/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The partial cluster zeroing code used during truncate usually assumes that the rightmost byte in the range to be zeroed lies on a cluster boundary. This makes sense for truncate, but punching holes might require zeroing on non-aligned rightmost boundaries. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: btree support for removal of arbirtrary extentsMark Fasheh2007-07-111-0/+367
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code to the btree paths to support the removal of arbitrary regions within an existing extent. With proper higher level support this can be used to "punch holes" in a file. Truncate (a special case of hole punching) could also be converted to use these methods. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: Support creation of unwritten extentsMark Fasheh2007-07-117-28/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can now be trivially supported with re-use of our existing extend code. ocfs2_allocate_unwritten_extents() takes a start offset and a byte length and iterates over the inode, adding extents (marked as unwritten) until len is reached. Existing extents are skipped over. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: support writing of unwritten extentsMark Fasheh2007-07-113-26/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the write code to detect when the user is asking to write to an unwritten extent. Like writing to a hole, we must zero the region between the write and the cluster boundaries. Most of the existing cluster zeroing logic can be re-used with some additional checks for the unwritten flag on extent records. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: small cleanup of ocfs2_write_begin_nolock()Mark Fasheh2007-07-111-32/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can easily seperate out the write descriptor setup and manipulation into helper functions. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: btree changes for unwritten extentsMark Fasheh2007-07-116-91/+1770
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Writes to a region marked as unwritten might result in a record split or merge. We can support splits by making minor changes to the existing insert code. Merges require left rotations which mostly re-use right rotation support functions. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: abstract btree growing callsMark Fasheh2007-07-111-45/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The top level calls and logic for growing a tree can easily be abstracted out of ocfs2_insert_extent() into a seperate function - ocfs2_grow_tree(). This allows future code to easily grow btrees when needed. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: use all extent block suballocatorsMark Fasheh2007-07-112-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have a method to deallocate blocks from them, each node should allocate extent blocks from their local suballocator file. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | | ocfs2: plug truncate into cached dealloc routinesMark Fasheh2007-07-115-94/+29
| | | | | | | | | | | | | | | | Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 21:15:07 +0100