aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-08-25drm: don't set the signal blocker on the master process.Dave Airlie1-8/+13
There is a problem with debugging the X server and gdb crashes in the xkb startup code. This avoids the problem by allowing the master process to get signals. It should be safe as the signal blocker is mainly so that you can Ctrl-Z a 3D application without locking up the whole box. Ctrl-Z the X server isn't something many people do. Signed-off-by: Dave Airlie <[email protected]>
2008-08-25drm: don't call the vblank tasklet with irqs disabled.Thomas Hellstrom2-15/+17
If a specific tasklet shares data with irq context, it needs to take a private irq-blocking spinlock within the tasklet itself. Signed-off-by: Dave Airlie <[email protected]>
2008-08-25r300: Fix cliprect emitNicolai Haehnle1-1/+4
This makes our handling of cliprects sane. drm_clip_rect always has exclusiv bottom-right corners, but the hardware expects inclusive bottom-right corner so we adjust this here. This complements Michel Daenzer's commit 57aea290e1e0a26d1e74df6cff777eb9f03 to Mesa. See also http://bugs.freedesktop.org/show_bug.cgi?id=16123 Signed-off-by: Dave Airlie <[email protected]>
2008-08-25drm/radeon: r300_cmdbuf: Always emit INDX_BUFFER immediately after DRAW_INDEXNicolai Haehnle1-16/+64
DRAW_INDEX writes a vertex count to VAP_VF_CNTL. Docs say that behaviour is undefined (i.e. lockups happen) when this write is not followed by the right number of vertex indices. Thus we used to do the wrong thing when drawing across many cliprects was necessary, because we emitted a sequence DRAW_INDEX, DRAW_INDEX, INDX_BUFFER, INDX_BUFFER instead of DRAW_INDEX, INDX_BUFFER, DRAW_INDEX, INDX_BUFFER The latter is what we're doing now and which ought to be correct. Signed-off-by: Dave Airlie <[email protected]>
2008-08-25radeon: fix some hard lockups on r3/4/500sJerome Glisse4-49/+130
This patch should fix hard lockup and convert them in softlockup (ie you can ssh the box but the gpu is busted and we are waiting in loop for it to come back to reason). Signed-off-by: Dave Airlie <[email protected]>
2008-07-30Fix off-by-one error in iov_iter_advance()Linus Torvalds1-1/+1
The iov_iter_advance() function would look at the iov->iov_len entry even though it might have iterated over the whole array, and iov was pointing past the end. This would cause DEBUG_PAGEALLOC to trigger a kernel page fault if the allocation was at the end of a page, and the next page was unallocated. The quick fix is to just change the order of the tests: check that there is any iovec data left before we check the iov entry itself. Thanks to Alexey Dobriyan for finding this case, and testing the fix. Reported-and-tested-by: Alexey Dobriyan <[email protected]> Cc: Nick Piggin <[email protected]> Cc: Andrew Morton <[email protected]> Cc: <[email protected]> [2.6.25.x, 2.6.26.x] Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30romfs_readpage: don't report errors for pages beyond i_sizeLinus Torvalds1-14/+23
We zero-fill them like we are supposed to, and that's all fine. It's only an error if the 'romfs_copyfrom()' routine isn't able to fill the data that is supposed to be there. Most of the patch is really just re-organizing the code a bit, and using separate variables for the error value and for how much of the page we actually filled from the filesystem. Reported-and-tested-by: Chris Fester <[email protected]> Cc: Alexander Viro <[email protected]> Cc: Matt Waddel <[email protected]> Cc: Greg Ungerer <[email protected]> Signed-of-by: Linus Torvalds <[email protected]>
2008-07-30Merge branch 'merge' of ↵Linus Torvalds54-290/+907
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/mm: Lockless get_user_pages_fast() for 64-bit (v3) powerpc: Don't use the wrong thread_struct for ptrace get/set VSX regs powerpc: Fix ptrace buffer size for VSX powerpc: Correctly hookup PTRACE_GET/SETVSRREGS for 32 bit processes ide/powermac: Fix use of uninitialized pointer on media-bay powerpc: Allow non-hcall return values for lparcfg writes ipmi/powerpc: Use linux/of_{device,platform}.h instead of asm powerpc/fsl: proliferate simple-bus compatibility to soc nodes Documentation: remove old sbc8260 board specific information cpm2: Rework baud rate generators configuration to support external clocks. powerpc: rtc_cmos_setup: assign interrupts only if there is i8259 PIC cpm_uart: Add generic clock API support to set baudrates cpm_uart: Modem control lines support powerpc: implement GPIO LIB API on CPM1 Freescale SoC. cpm2: Implement GPIO LIB API on CPM2 Freescale SoC. powerpc: Fix 8xx build failure powerpc: clean up the Book-E HW watchpoint support
2008-07-30cpumask: statement expressions confuse some versions of gccStephen Rothwell1-1/+1
when you take the address of the result. Noticed on a sparc64 compile using a version 3.4.5 cross compiler. kernel/time/tick-common.c: In function `tick_check_new_device': kernel/time/tick-common.c:210: error: invalid lvalue in unary `&' ... Just make it a regular expression. Signed-off-by: Stephen Rothwell <[email protected]> Acked-by: Ingo Molnar <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds57-486/+713
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits) net: Make "networking" one-click deselectable. ipv6: Fix useless proc net sockstat6 removal tcp: MD5: Use MIB counter instead of warning for MD5 mismatch. pkt_sched: Fix OOPS on ingress qdisc add. niu: Fix error checking in niu_ethflow_to_class. IPv6: datagram_send_ctl() should exit immediately when an error occured mac80211: fix mesh beaconing PS3: gelic: use unsigned long for irqflags mac80211: fix cfg80211 hooks for master interface nl80211: fix dump callbacks mac80211: partially fix skb->cb use rtl8187: Improve wireless statistics for RTL8187B rtl8187: Fix for TX sequence number problem mac80211: append CONFIG_ to MAC80211_VERBOSE_PS_DEBUG in net/mac80211/tx.c. mac80211: fix sparse integer as NULL pointer warning drivers/net/wireless/iwlwifi/iwl-led.c: printk fix mac80211: return correct error return from ieee80211_wep_init mac80211: tx, use dev_kfree_skb_any for beacon_get rt2x00: Clear queue entry flags during initialization rt2x00: Force full register config after start() ...
2008-07-30x86: wrong register was used in align macroVitaly Mayatskikh2-3/+2
New ALIGN_DESTINATION macro has sad typo: r8d register was used instead of ecx in fixup section. This can be considered as a regression. Register ecx was also wrongly loaded with value in r8d in copy_user_nocache routine. Signed-off-by: Vitaly Mayatskikh <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: setup the notify GRU message queueDean Nelson8-384/+1032
Setup the notify GRU message queue that is used for sending user messages on UV systems. Signed-off-by: Dean Nelson <[email protected]> Cc: Jack Steiner <[email protected]> Cc: "Luck, Tony" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: setup the activate GRU message queueDean Nelson8-390/+1328
Setup the activate GRU message queue that is used for partition activation and channel connection on UV systems. Signed-off-by: Dean Nelson <[email protected]> Cc: Jack Steiner <[email protected]> Cc: "Luck, Tony" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: cleanup naming of partition definesDean Nelson5-51/+51
Cleanup naming of partition defines. Signed-off-by: Dean Nelson <[email protected]> Cc: Jack Steiner <[email protected]> Cc: "Luck, Tony" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: move xpc_check_remote_hb() to support both SN2 and UVDean Nelson3-49/+57
Move xpc_check_remote_hb() so it can support both SN2 and UV. Signed-off-by: Dean Nelson <[email protected]> Cc: Jack Steiner <[email protected]> Cc: "Luck, Tony" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: add usage of GRU driver by xpc_remote_memcpy()Dean Nelson11-127/+154
Add UV support to xpc_remote_memcpy(), which involves interfacing to the GRU driver. Signed-off-by: Dean Nelson <[email protected]> Cc: Jack Steiner <[email protected]> Cc: "Luck, Tony" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: enable building of XPC/XPNET on x86_64Dean Nelson12-126/+155
Get XPC/XPNET to build on x86_64. Trying to modprobe them up on a non-UV or sn2 system will result in a -ENODEV. Signed-off-by: Dean Nelson <[email protected]> Cc: Jack Steiner <[email protected]> Cc: "Luck, Tony" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: add 'jiffies' to reserved page's timestamp nameDean Nelson4-26/+28
Rename XPC's reserved page's timestamp member to reflect the units of time involved. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: use standard bitops macros and functionsDean Nelson4-86/+76
Change sgi-xp to use the standard bitops macros and functions instead of trying to invent its own mechanism. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: eliminate '>>>' in commentsDean Nelson9-44/+43
Comments in /drivers/misc/sgi-xp has been using '>>>' as a means to draw attention to something that needs to be done or considered. To avoid colliding with git rejects, '>>>' will now be replaced by '!!!' to indicate something to do, and by '???' to indicate something to be considered. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: add _sn2 suffix to a few variablesDean Nelson1-59/+65
Add an '_sn2' suffix to some variables found in xpc_sn2.c. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: isolate remote copy buffer to sn2 onlyDean Nelson5-102/+97
Make the remote copy buffer an sn2 only item. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: enable XPNET to handle more than 64 partitionsDean Nelson1-119/+94
Enable XPNET to support more than 64 partitions. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: isolate allocation of XPC's msgqueues to sn2 onlyDean Nelson4-203/+204
Move the allocation of XPC's msgqueues to xpc_sn2.c. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: replace AMO_t typedef by struct amoDean Nelson5-96/+101
Replace the AMO_t typedef by a direct reference to 'struct amo'. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: separate chctl_flags from XPC's notify IRQDean Nelson5-302/+327
Tie current IPI references to either XPC's notify IRQ or channel control flags. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: isolate additional sn2 specific codeDean Nelson6-806/+784
Move additional sn2 specific code into xpc_sn2.c. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: isolate activate IRQ's hardware specific componentsDean Nelson4-219/+229
Isolate architecture specific code related to XPC's activate IRQ. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: move xpc_allocate() into xpc_send()/xpc_send_notify()Dean Nelson7-171/+106
Move xpc_allocate() functionality into xpc_send()/xpc_send_notify() so xpc_allocate() no longer needs to be called by XPNET. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: base xpc_rsvd_page's timestamp on jiffiesDean Nelson4-57/+34
Change XPC's reserved page timestamp to be based on jiffies. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: isolate xpc_vars structure to sn2 onlyDean Nelson6-1255/+1433
Isolate the xpc_vars structure of XPC's reserved page to sn2 only. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: isolate xpc_vars_part structure to sn2 onlyDean Nelson6-629/+644
Isolate the xpc_vars_part structure of XPC's reserved page to sn2 only. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: prepare xpc_rsvd_page to work on either sn2 or uv hardwareDean Nelson7-133/+267
Prepare XPC's reserved page header to work for either sn2 or uv. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: create a common xp_remote_memcpy() functionDean Nelson8-106/+107
Create a common remote memcpy function that maps to what the hardware booted supports. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: support runtime selection of xp_max_npartitionsDean Nelson10-151/+266
Support runtime selection of the max number of partitions based on the hardware being run on. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: define BYTES_PER_WORDDean Nelson1-0/+3
Add a BYTES_PER_WORD #define. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: define xpSalError reason codeDean Nelson1-1/+2
Define xpSalError reason code. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30sgi-xp: define is_shub() and is_uv() macrosDean Nelson1-0/+16
Define the is_shub()/is_uv() macros if they've not already been defined. Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver V3: fixes to resolve code review commentsJack Steiner7-29/+93
Fixes problems identified in a code review: - add comment with high level dscription of the GRU - prepend "gru_" to all global names - delete unused function - couple of trivial bug fixes [[email protected]: coding-style fixes] Signed-off-by: Jack Steiner <[email protected]> Cc: Nick Piggin <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: driver/misc Makefile & Kconfig changesJack Steiner2-0/+24
Driver/misc changes for the GRU driver Signed-off-by: Jack Steiner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: export is_uv_system(), zap_page_range() & follow_page()Jack Steiner2-0/+3
Exports needed by the GRU driver. Signed-off-by: Jack Steiner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: driver makefileJack Steiner1-0/+3
This patch adds the GRU driver makefile Signed-off-by: Jack Steiner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: TLB flushing, MMUOPS calloutsJack Steiner1-0/+370
This file contains the functions for handlinf GRU TLB flushing, This includes functions to handle the MMUOPS callouts. Signed-off-by: Jack Steiner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: /proc interfacesJack Steiner1-0/+336
This file externalizes some GRU state & statistics to the user using the /proc file system. Signed-off-by: Jack Steiner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: resource managementJack Steiner1-0/+798
This file contains functions realted to managing GRU resources provided to the user. Examples include GRU context assignment, load, unload, migration, etc.. Signed-off-by: Jack Steiner <[email protected]> Cc: Nick Piggin <[email protected]> Cc: Hugh Dickins <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: kernel services provide by driverJack Steiner1-0/+679
This file contains functions for handling services provided to other kernel modules that use the GRU. Signed-off-by: Jack Steiner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: page faults & exceptionsJack Steiner1-0/+633
This file contains the functions that manage GRU page faults and exceptions. Signed-off-by: Jack Steiner <[email protected]> Cc: Christoph Hellwig <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: driver initialization, file & vma opsJack Steiner1-0/+481
This file contains the functions for initializing the driver, handling file & vma operations and for processing IOCTL requests from the user. Signed-off-by: Jack Steiner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: kernel services header filesJack Steiner1-0/+134
This patch contains the header file used to export GRU services to other kernel drivers such as XPMEM or XPNET. Signed-off-by: Jack Steiner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-07-30GRU Driver: driver internal header filesJack Steiner3-0/+709
This patch contains header files internal to the GRU driver. Signed-off-by: Jack Steiner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>