Peter Zijlstra
0b16f21f14
[PATCH] rtc: lockdep fix/workaround
...
BUG: warning at kernel/lockdep.c:1816/trace_hardirqs_on() (Not tainted)
[<c04051ee>] show_trace_log_lvl+0x58/0x171
[<c0405802>] show_trace+0xd/0x10
[<c040591b>] dump_stack+0x19/0x1b
[<c043abee>] trace_hardirqs_on+0xa2/0x11e
[<c06143c3>] _spin_unlock_irq+0x22/0x26
[<c0541540>] rtc_get_rtc_time+0x32/0x176
[<c0419ba4>] hpet_rtc_interrupt+0x92/0x14d
[<c0450f94>] handle_IRQ_event+0x20/0x4d
[<c0451055>] __do_IRQ+0x94/0xef
[<c040678d>] do_IRQ+0x9e/0xbd
[<c0404a49>] common_interrupt+0x25/0x2c
DWARF2 unwinder stuck at common_interrupt+0x25/0x2c
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl >
Acked-by: Ingo Molnar <mingo@elte.hu >
Cc: <stable@kernel.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-09-25 17:38:35 -07:00
Stephen Rothwell
de0138da0f
[POWERPC] The two vio HVC backends clash
...
Make sure only one of them actually registers as a driver.
Also, remove cast from get_property().
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au >
2006-09-25 13:30:51 +10:00
Al Viro
4ac493b1d5
[PATCH] briq_panel: read() and write() get __user pointers, damnit
...
annotated, fixed a roothole in ->write(). Dereferencing user-supplied pointer
is a Bad Idea(tm)...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-09-23 11:34:43 -07:00
Al Viro
13b5aeccc4
[PATCH] more fallout from get_property returning pointer to const
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-09-23 11:34:43 -07:00
Linus Torvalds
6585b57240
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
...
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] Rework AGPv3 modesetting fallback.
[AGPGART] Add suspend callback for i965
[AGPGART] Fix number of aperture sizes in 830 gart structs.
[AGPGART] Intel 965 Express support.
[AGPGART] agp.h: constify struct agp_bridge_data::version
[AGPGART] const'ify VIA AGP PCI table.
[AGPGART] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c
[AGPGART] CONFIG_PM=n slim: drivers/char/agp/efficeon-agp.c
[AGPGART] Const'ify the agpgart driver version.
[AGPGART] remove private page protection map
2006-09-22 17:50:50 -07:00
Al Viro
634965f5cf
[PATCH] memcpy_fromio() missing in istallion
...
memcpy() from iomem is a bad thing...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-09-22 17:48:56 -07:00
Linus Torvalds
14d1adfc59
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
...
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (114 commits)
[POWERPC] Fix ohare IDE irq workaround on old powermacs
[POWERPC] EEH: Power4 systems sometimes need multiple resets.
[POWERPC] Include <asm/mmu.h> in arch/powerpc/sysdev/fsl_soc.h for phys_addr_t.
[POWERPC] Demacrofy arch/powerpc/platforms/maple/pci.c
[POWERPC] Maple U3 HT - reject inappropriate config space access
[POWERPC] Fix IPIC pending register assignments
[POWERPC] powerpc: fix building gdb against asm/ptrace.h
[POWERPC] Remove DISCONTIGMEM cruft from page.h
[POWERPC] Merge iSeries i/o operations with the rest
[POWERPC] 40x: Fix debug status register defines
[POWERPC] Fix compile error in sbc8560
[POWERPC] EEH: support MMIO enable recovery step
[POWERPC] EEH: enable MMIO/DMA on frozen slot
[POWERPC] EEH: code comment cleanup
[POWERPC] EEH: balance pcidev_get/put calls
[POWERPC] PPC: Fix xmon stack frame address in backtrace
[POWERPC] Add AT_PLATFORM value for Xilinx Virtex-4 FX
[POWERPC] Start arch/powerpc/boot code reorganization
[POWERPC] Define of_read_ulong helper
[POWERPC] iseries: eliminate a couple of warnings
...
2006-09-22 12:48:03 -07:00
Michel Daenzer
3e14a2867d
drm: Use register writes instead of BITBLT_MULTI packets for buffer swap blits
...
This takes up two more ring buffer entries per rectangle blitted but makes sure
the blit is performed top to bottom, reducing the likelyhood of tearing.
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:34 +10:00
Dave Airlie
54a56ac583
drm: use radeon specific names for radeon flags
...
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:34 +10:00
Eric Anholt
2f02cc3fb8
drm: add device/vendor id to drm_device_t for compat with FreeBSD drivers
...
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:34 +10:00
Thomas Hellstrom
e08870c87a
drm: allow multiple addMaps with the same 32-bit map offsset.
...
Reported on -mm kernels.
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:34 +10:00
Michel Daenzer
214ff13d9e
drm: fd.o Bug #7595 : Avoid u32 overflows in radeon_check_and_fixup_offset().
...
The overflows could cause valid offsets to get rejected under some
circumstances, e.g. when the framebuffer resides at the very end of the card's
address space.
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:34 +10:00
Thomas Hellstrom
47cc140931
drm: Fix hashtab implementation leaking illegal error codes to user space.
...
reported by Dave Airlie
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:34 +10:00
Dave Airlie
9b1a51b69c
drm: domain changes broke ppc r200
...
Freedesktop.org bug #8246
The domain changes regressed on PPC, go back to just using 0,
as X.org's domain support is crap
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:33 +10:00
Dave Airlie
1f27ce6ab7
drm: fixup setversion return codes..
...
Frederik Deweerdt <deweerdt@free.fr > noticed some badness in setversion
returns, however just making it work, breaks things... this code is hairy
with backwards compat...
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:33 +10:00
Dave Airlie
46acbf13fb
drm: fixup i915 error codes
...
Frederik Deweerdt <deweerdt@free.fr > pointed this out, I fixed a missing
DRM error wrapper also.
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:33 +10:00
Dave Airlie
b15ec36806
drm: realign sosme radeon code with drm git tree
...
this applies some minor cleanups for the radeon driver, to use the
3D flush and reset the AGP flags on X recycle
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:33 +10:00
Dave Airlie
d40c8533a5
drm: realign via driver with drm git tree
...
This just realigns some code/whitespace between the kernel and main tree
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:33 +10:00
Thomas Hellstrom
1f4eccfdb2
drm: remove hash tables on drm exit
...
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:33 +10:00
Adrian Bunk
fb41e54be4
drm: cleanups
...
This patch contains the following cleanups:
- make 3 needlessly global functions static
- sis_mm.c: fix compile warnings with CONFIG_FB_SIS=y
Signed-off-by: Adrian Bunk <bunk@stusta.de >
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:33 +10:00
Denis Vlasenko
c7aed17902
drm: i810_dma.c: fix pointer arithmetic for 64-bit target
...
First warning result from open-coded PTR_ERR,
the rest is caused by code like this:
*(u32 *) ((u32) buf_priv->kernel_virtual + used)
I've also fixed a missing PTR_ERR in i830_dma.c
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:33 +10:00
Thomas Hellstrom
0a0c721dc5
drm: avoid kernel oops in some error paths calling drm_lastclose
...
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:32 +10:00
Chuck Short
bd5af0781a
drm: allow detection of new VIA chipsets
...
Update pci ids.
patch location:
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=c
ommitdiff;h=5195a64a27550a279b2ecaf400066a3823f2d053
Signed-off-by: Chuck Short <zulcss@gmail.com >
Signed-off-by: Ben Collins <bcollins@ubuntu.com >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:32 +10:00
Andrew Morton
78eca43d03
drm: fix i965 build bug
...
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:32 +10:00
Andrew Morton
a1d0fcf5a1
drm: remove FALSE/TRUE that snuck in with simple memory manager changes.
...
Thanks to Andrew Morton for pointing these out, I've fixed a few his patch
missed.
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Dave Airlie <airlied@linux.ie >
2006-09-22 05:32:32 +10:00