rpms/kernel/F-12 patch-2.6.32.4.bz2.sign, NONE, 1.1 .cvsignore, 1.1140, 1.1141 drm-upgrayedd.patch, 1.1, 1.2 kernel.spec, 1.1987, 1.1988 linux-2.6-execshield.patch, 1.110, 1.111 sources, 1.1098, 1.1099 upstream, 1.1012, 1.1013 patch-2.6.32.3.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Mon Jan 18 19:36:40 UTC 2010
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5919
Modified Files:
.cvsignore drm-upgrayedd.patch kernel.spec
linux-2.6-execshield.patch sources upstream
Added Files:
patch-2.6.32.4.bz2.sign
Removed Files:
patch-2.6.32.3.bz2.sign
Log Message:
* Mon Jan 18 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.4-28
- Linux stable 2.6.32.4
- drm-upgrayedd: rebase for related changes in intel_display.c, i915_drv.h
--- NEW FILE patch-2.6.32.4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBLVKypyGugalF9Dw4RArUwAJ4mf99XI3XipwMCy0aKr/RCSEUIRwCfT9k4
3YMH+iy7bZN/wYaJCA/np6o=
=vIak
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1140
retrieving revision 1.1141
diff -u -p -r1.1140 -r1.1141
--- .cvsignore 7 Jan 2010 01:28:07 -0000 1.1140
+++ .cvsignore 18 Jan 2010 19:36:39 -0000 1.1141
@@ -5,4 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.32
linux-2.6.32.tar.bz2
-patch-2.6.32.3.bz2
+patch-2.6.32.4.bz2
drm-upgrayedd.patch:
b/drivers/char/agp/Kconfig | 3
b/drivers/char/agp/amd64-agp.c | 9
b/drivers/char/agp/frontend.c | 28
b/drivers/char/agp/intel-agp.c | 96
b/drivers/char/agp/uninorth-agp.c | 77
b/drivers/gpu/drm/Makefile | 5
b/drivers/gpu/drm/drm_crtc.c | 181
b/drivers/gpu/drm/drm_crtc_helper.c | 28
b/drivers/gpu/drm/drm_dp_i2c_helper.c | 209
b/drivers/gpu/drm/drm_drv.c | 55
b/drivers/gpu/drm/drm_edid.c | 332 -
b/drivers/gpu/drm/drm_fb_helper.c | 34
b/drivers/gpu/drm/drm_fops.c | 112
b/drivers/gpu/drm/drm_ioc32.c | 89
b/drivers/gpu/drm/drm_irq.c | 101
b/drivers/gpu/drm/drm_mm.c | 112
b/drivers/gpu/drm/drm_modes.c | 28
b/drivers/gpu/drm/drm_stub.c | 15
b/drivers/gpu/drm/i2c/Makefile | 4
b/drivers/gpu/drm/i2c/ch7006_drv.c | 536 +
b/drivers/gpu/drm/i2c/ch7006_mode.c | 468 +
b/drivers/gpu/drm/i2c/ch7006_priv.h | 344 +
b/drivers/gpu/drm/i810/i810_dma.c | 2
b/drivers/gpu/drm/i810/i810_drv.c | 2
b/drivers/gpu/drm/i830/i830_dma.c | 2
b/drivers/gpu/drm/i830/i830_drv.c | 2
b/drivers/gpu/drm/i915/Makefile | 2
b/drivers/gpu/drm/i915/dvo_ch7017.c | 9
b/drivers/gpu/drm/i915/dvo_ch7xxx.c | 16
b/drivers/gpu/drm/i915/dvo_ivch.c | 37
b/drivers/gpu/drm/i915/dvo_sil164.c | 20
b/drivers/gpu/drm/i915/dvo_tfp410.c | 34
b/drivers/gpu/drm/i915/i915_debugfs.c | 141
b/drivers/gpu/drm/i915/i915_dma.c | 63
b/drivers/gpu/drm/i915/i915_drv.c | 177
b/drivers/gpu/drm/i915/i915_drv.h | 182
b/drivers/gpu/drm/i915/i915_gem.c | 352 +
b/drivers/gpu/drm/i915/i915_gem_tiling.c | 52
b/drivers/gpu/drm/i915/i915_ioc32.c | 23
b/drivers/gpu/drm/i915/i915_irq.c | 195
b/drivers/gpu/drm/i915/i915_opregion.c | 92
b/drivers/gpu/drm/i915/i915_reg.h | 78
b/drivers/gpu/drm/i915/i915_suspend.c | 86
b/drivers/gpu/drm/i915/intel_bios.c | 137
b/drivers/gpu/drm/i915/intel_bios.h | 17
b/drivers/gpu/drm/i915/intel_crt.c | 52
b/drivers/gpu/drm/i915/intel_display.c | 1116 ++--
b/drivers/gpu/drm/i915/intel_dp.c | 162
b/drivers/gpu/drm/i915/intel_drv.h | 44
b/drivers/gpu/drm/i915/intel_fb.c | 9
b/drivers/gpu/drm/i915/intel_hdmi.c | 60
b/drivers/gpu/drm/i915/intel_i2c.c | 21
b/drivers/gpu/drm/i915/intel_lvds.c | 176
b/drivers/gpu/drm/i915/intel_overlay.c | 1416 +++++
b/drivers/gpu/drm/i915/intel_sdvo.c | 19
b/drivers/gpu/drm/i915/intel_tv.c | 49
b/drivers/gpu/drm/mga/mga_drv.c | 2
b/drivers/gpu/drm/mga/mga_ioc32.c | 13
b/drivers/gpu/drm/nouveau/Kconfig | 44
b/drivers/gpu/drm/nouveau/Makefile | 32
b/drivers/gpu/drm/nouveau/nouveau_acpi.c | 125
b/drivers/gpu/drm/nouveau/nouveau_backlight.c | 155
b/drivers/gpu/drm/nouveau/nouveau_bios.c | 6078 ++++++++++++++++++++++
b/drivers/gpu/drm/nouveau/nouveau_bios.h | 290 +
b/drivers/gpu/drm/nouveau/nouveau_bo.c | 771 ++
b/drivers/gpu/drm/nouveau/nouveau_calc.c | 478 +
b/drivers/gpu/drm/nouveau/nouveau_channel.c | 431 +
b/drivers/gpu/drm/nouveau/nouveau_connector.c | 824 ++
b/drivers/gpu/drm/nouveau/nouveau_connector.h | 54
b/drivers/gpu/drm/nouveau/nouveau_crtc.h | 95
b/drivers/gpu/drm/nouveau/nouveau_debugfs.c | 155
b/drivers/gpu/drm/nouveau/nouveau_display.c | 115
b/drivers/gpu/drm/nouveau/nouveau_dma.c | 226
b/drivers/gpu/drm/nouveau/nouveau_dma.h | 159
b/drivers/gpu/drm/nouveau/nouveau_dp.c | 569 ++
b/drivers/gpu/drm/nouveau/nouveau_drv.c | 409 +
b/drivers/gpu/drm/nouveau/nouveau_drv.h | 1345 ++++
b/drivers/gpu/drm/nouveau/nouveau_encoder.h | 91
b/drivers/gpu/drm/nouveau/nouveau_fb.h | 47
b/drivers/gpu/drm/nouveau/nouveau_fbcon.c | 389 +
b/drivers/gpu/drm/nouveau/nouveau_fbcon.h | 48
b/drivers/gpu/drm/nouveau/nouveau_fence.c | 262
b/drivers/gpu/drm/nouveau/nouveau_gem.c | 978 +++
b/drivers/gpu/drm/nouveau/nouveau_grctx.c | 161
b/drivers/gpu/drm/nouveau/nouveau_grctx.h | 133
b/drivers/gpu/drm/nouveau/nouveau_hw.c | 1080 +++
b/drivers/gpu/drm/nouveau/nouveau_hw.h | 455 +
b/drivers/gpu/drm/nouveau/nouveau_i2c.c | 269
b/drivers/gpu/drm/nouveau/nouveau_i2c.h | 52
b/drivers/gpu/drm/nouveau/nouveau_ioc32.c | 70
b/drivers/gpu/drm/nouveau/nouveau_irq.c | 703 ++
b/drivers/gpu/drm/nouveau/nouveau_mem.c | 659 ++
b/drivers/gpu/drm/nouveau/nouveau_notifier.c | 196
b/drivers/gpu/drm/nouveau/nouveau_object.c | 1294 ++++
b/drivers/gpu/drm/nouveau/nouveau_reg.h | 836 +++
b/drivers/gpu/drm/nouveau/nouveau_sgdma.c | 321 +
b/drivers/gpu/drm/nouveau/nouveau_state.c | 871 +++
b/drivers/gpu/drm/nouveau/nouveau_ttm.c | 103
b/drivers/gpu/drm/nouveau/nv04_crtc.c | 1002 +++
b/drivers/gpu/drm/nouveau/nv04_cursor.c | 70
b/drivers/gpu/drm/nouveau/nv04_dac.c | 527 +
b/drivers/gpu/drm/nouveau/nv04_dfp.c | 623 ++
b/drivers/gpu/drm/nouveau/nv04_display.c | 287 +
b/drivers/gpu/drm/nouveau/nv04_fb.c | 21
b/drivers/gpu/drm/nouveau/nv04_fbcon.c | 315 +
b/drivers/gpu/drm/nouveau/nv04_fifo.c | 305 +
b/drivers/gpu/drm/nouveau/nv04_graph.c | 584 ++
b/drivers/gpu/drm/nouveau/nv04_instmem.c | 208
b/drivers/gpu/drm/nouveau/nv04_mc.c | 20
b/drivers/gpu/drm/nouveau/nv04_timer.c | 51
b/drivers/gpu/drm/nouveau/nv04_tv.c | 305 +
b/drivers/gpu/drm/nouveau/nv10_fb.c | 44
b/drivers/gpu/drm/nouveau/nv10_fifo.c | 260
b/drivers/gpu/drm/nouveau/nv10_graph.c | 1009 +++
b/drivers/gpu/drm/nouveau/nv17_gpio.c | 92
b/drivers/gpu/drm/nouveau/nv17_tv.c | 776 ++
b/drivers/gpu/drm/nouveau/nv17_tv.h | 156
b/drivers/gpu/drm/nouveau/nv17_tv_modes.c | 583 ++
b/drivers/gpu/drm/nouveau/nv20_graph.c | 775 ++
b/drivers/gpu/drm/nouveau/nv40_fb.c | 75
b/drivers/gpu/drm/nouveau/nv40_fifo.c | 314 +
b/drivers/gpu/drm/nouveau/nv40_graph.c | 406 +
b/drivers/gpu/drm/nouveau/nv40_grctx.c | 678 ++
b/drivers/gpu/drm/nouveau/nv40_mc.c | 38
b/drivers/gpu/drm/nouveau/nv50_crtc.c | 769 ++
b/drivers/gpu/drm/nouveau/nv50_cursor.c | 156
b/drivers/gpu/drm/nouveau/nv50_dac.c | 304 +
b/drivers/gpu/drm/nouveau/nv50_display.c | 1032 +++
b/drivers/gpu/drm/nouveau/nv50_display.h | 46
b/drivers/gpu/drm/nouveau/nv50_evo.h | 113
b/drivers/gpu/drm/nouveau/nv50_fbcon.c | 270
b/drivers/gpu/drm/nouveau/nv50_fifo.c | 492 +
b/drivers/gpu/drm/nouveau/nv50_graph.c | 389 +
b/drivers/gpu/drm/nouveau/nv50_instmem.c | 509 +
b/drivers/gpu/drm/nouveau/nv50_mc.c | 40
b/drivers/gpu/drm/nouveau/nv50_sor.c | 309 +
b/drivers/gpu/drm/nouveau/nvreg.h | 535 +
b/drivers/gpu/drm/r128/r128_drv.c | 2
b/drivers/gpu/drm/r128/r128_ioc32.c | 16
b/drivers/gpu/drm/radeon/Makefile | 7
b/drivers/gpu/drm/radeon/ObjectID.h | 801 +-
b/drivers/gpu/drm/radeon/atom.c | 45
b/drivers/gpu/drm/radeon/atom.h | 3
b/drivers/gpu/drm/radeon/atombios.h | 217
b/drivers/gpu/drm/radeon/atombios_crtc.c | 57
b/drivers/gpu/drm/radeon/atombios_dp.c | 792 ++
b/drivers/gpu/drm/radeon/mkregtable.c | 4
b/drivers/gpu/drm/radeon/r100.c | 308 -
b/drivers/gpu/drm/radeon/r100_track.h | 19
b/drivers/gpu/drm/radeon/r200.c | 10
b/drivers/gpu/drm/radeon/r300.c | 104
b/drivers/gpu/drm/radeon/r300_cmdbuf.c | 6
b/drivers/gpu/drm/radeon/r300_reg.h | 1
b/drivers/gpu/drm/radeon/r420.c | 66
b/drivers/gpu/drm/radeon/r500_reg.h | 2
b/drivers/gpu/drm/radeon/r520.c | 9
b/drivers/gpu/drm/radeon/r600.c | 1177 +++-
b/drivers/gpu/drm/radeon/r600_audio.c | 267
b/drivers/gpu/drm/radeon/r600_blit_kms.c | 34
b/drivers/gpu/drm/radeon/r600_cs.c | 4
b/drivers/gpu/drm/radeon/r600_hdmi.c | 506 +
b/drivers/gpu/drm/radeon/r600_reg.h | 74
b/drivers/gpu/drm/radeon/r600d.h | 212
b/drivers/gpu/drm/radeon/radeon.h | 197
b/drivers/gpu/drm/radeon/radeon_agp.c | 6
b/drivers/gpu/drm/radeon/radeon_asic.h | 65
b/drivers/gpu/drm/radeon/radeon_atombios.c | 468 +
b/drivers/gpu/drm/radeon/radeon_benchmark.c | 36
b/drivers/gpu/drm/radeon/radeon_clocks.c | 25
b/drivers/gpu/drm/radeon/radeon_combios.c | 761 ++
b/drivers/gpu/drm/radeon/radeon_connectors.c | 221
b/drivers/gpu/drm/radeon/radeon_cp.c | 46
b/drivers/gpu/drm/radeon/radeon_cs.c | 13
b/drivers/gpu/drm/radeon/radeon_device.c | 148
b/drivers/gpu/drm/radeon/radeon_display.c | 157
b/drivers/gpu/drm/radeon/radeon_drv.c | 12
b/drivers/gpu/drm/radeon/radeon_drv.h | 1
b/drivers/gpu/drm/radeon/radeon_encoders.c | 322 -
b/drivers/gpu/drm/radeon/radeon_fb.c | 74
b/drivers/gpu/drm/radeon/radeon_fence.c | 65
b/drivers/gpu/drm/radeon/radeon_fixed.h | 17
b/drivers/gpu/drm/radeon/radeon_gart.c | 42
b/drivers/gpu/drm/radeon/radeon_gem.c | 108
b/drivers/gpu/drm/radeon/radeon_i2c.c | 182
b/drivers/gpu/drm/radeon/radeon_ioc32.c | 38
b/drivers/gpu/drm/radeon/radeon_irq.c | 10
b/drivers/gpu/drm/radeon/radeon_irq_kms.c | 71
b/drivers/gpu/drm/radeon/radeon_kms.c | 42
b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 102
b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 127
b/drivers/gpu/drm/radeon/radeon_legacy_tv.c | 14
b/drivers/gpu/drm/radeon/radeon_mode.h | 184
b/drivers/gpu/drm/radeon/radeon_object.c | 579 --
b/drivers/gpu/drm/radeon/radeon_object.h | 151
b/drivers/gpu/drm/radeon/radeon_pm.c | 9
b/drivers/gpu/drm/radeon/radeon_reg.h | 60
b/drivers/gpu/drm/radeon/radeon_ring.c | 67
b/drivers/gpu/drm/radeon/radeon_state.c | 2
b/drivers/gpu/drm/radeon/radeon_test.c | 55
b/drivers/gpu/drm/radeon/radeon_ttm.c | 110
b/drivers/gpu/drm/radeon/reg_srcs/r420 | 795 ++
b/drivers/gpu/drm/radeon/reg_srcs/rs600 | 68
b/drivers/gpu/drm/radeon/reg_srcs/rv515 | 6
b/drivers/gpu/drm/radeon/rs400.c | 21
b/drivers/gpu/drm/radeon/rs600.c | 233
b/drivers/gpu/drm/radeon/rs600d.h | 112
b/drivers/gpu/drm/radeon/rs690.c | 40
b/drivers/gpu/drm/radeon/rv515.c | 25
b/drivers/gpu/drm/radeon/rv770.c | 94
b/drivers/gpu/drm/savage/savage_drv.c | 2
b/drivers/gpu/drm/sis/sis_drv.c | 2
b/drivers/gpu/drm/tdfx/tdfx_drv.c | 2
b/drivers/gpu/drm/ttm/Makefile | 3
b/drivers/gpu/drm/ttm/ttm_bo.c | 674 +-
b/drivers/gpu/drm/ttm/ttm_bo_util.c | 3
b/drivers/gpu/drm/ttm/ttm_bo_vm.c | 9
b/drivers/gpu/drm/ttm/ttm_execbuf_util.c | 117
b/drivers/gpu/drm/ttm/ttm_lock.c | 311 +
b/drivers/gpu/drm/ttm/ttm_memory.c | 16
b/drivers/gpu/drm/ttm/ttm_object.c | 452 +
b/drivers/gpu/drm/ttm/ttm_tt.c | 1
b/drivers/gpu/drm/via/via_drv.c | 2
b/drivers/gpu/drm/vmwgfx/Kconfig | 13
b/drivers/gpu/drm/vmwgfx/Makefile | 9
b/drivers/gpu/drm/vmwgfx/svga3d_reg.h | 1793 ++++++
b/drivers/gpu/drm/vmwgfx/svga_escape.h | 89
b/drivers/gpu/drm/vmwgfx/svga_overlay.h | 201
b/drivers/gpu/drm/vmwgfx/svga_reg.h | 1346 ++++
b/drivers/gpu/drm/vmwgfx/svga_types.h | 45
b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 229
b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 726 ++
b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 513 +
b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 621 ++
b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 742 ++
b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 519 +
b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 213
b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 81
b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 293 +
b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 872 +++
b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 102
b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 516 +
b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 634 ++
b/drivers/gpu/drm/vmwgfx/vmwgfx_reg.h | 57
b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 1183 ++++
b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 99
b/include/drm/Kbuild | 2
b/include/drm/drm.h | 65
b/include/drm/drmP.h | 91
b/include/drm/drm_crtc.h | 47
b/include/drm/drm_dp_helper.h | 180
b/include/drm/drm_edid.h | 8
b/include/drm/drm_mm.h | 35
b/include/drm/drm_mode.h | 81
b/include/drm/drm_os_linux.h | 2
b/include/drm/i2c/ch7006.h | 86
b/include/drm/i915_drm.h | 132
b/include/drm/mga_drm.h | 2
b/include/drm/nouveau_drm.h | 220
b/include/drm/radeon_drm.h | 2
b/include/drm/ttm/ttm_bo_api.h | 115
b/include/drm/ttm/ttm_bo_driver.h | 37
b/include/drm/ttm/ttm_execbuf_util.h | 107
b/include/drm/ttm/ttm_lock.h | 247
b/include/drm/ttm/ttm_object.h | 271
b/include/drm/via_drm.h | 2
b/include/drm/vmwgfx_drm.h | 575 ++
drivers/gpu/drm/i915/intel_dp.h | 144
drivers/gpu/drm/i915/intel_dp_i2c.c | 273
268 files changed, 65111 insertions(+), 4414 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 drm-upgrayedd.patchIndex: drm-upgrayedd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-upgrayedd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-upgrayedd.patch 11 Jan 2010 23:43:06 -0000 1.1
+++ drm-upgrayedd.patch 18 Jan 2010 19:36:39 -0000 1.2
@@ -1,3 +1,403 @@
+From 718522b6c04e3f16d61cca8d481c700758bacb33 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
+Date: Mon, 18 Jan 2010 14:10:14 -0500
+Subject: drm-upgrayedd
+
+---
+ drivers/char/agp/Kconfig | 3 +-
+ drivers/char/agp/amd64-agp.c | 9 +-
+ drivers/char/agp/frontend.c | 28 +-
+ drivers/char/agp/intel-agp.c | 96 +-
+ drivers/char/agp/uninorth-agp.c | 77 +-
+ drivers/gpu/drm/Makefile | 5 +-
+ drivers/gpu/drm/drm_crtc.c | 181 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 28 +-
+ drivers/gpu/drm/drm_dp_i2c_helper.c | 209 +
+ drivers/gpu/drm/drm_drv.c | 55 +-
+ drivers/gpu/drm/drm_edid.c | 332 +-
+ drivers/gpu/drm/drm_fb_helper.c | 34 +-
+ drivers/gpu/drm/drm_fops.c | 112 +-
+ drivers/gpu/drm/drm_ioc32.c | 89 +-
+ drivers/gpu/drm/drm_irq.c | 101 +-
+ drivers/gpu/drm/drm_mm.c | 112 +-
+ drivers/gpu/drm/drm_modes.c | 28 +-
+ drivers/gpu/drm/drm_stub.c | 15 +
+ drivers/gpu/drm/i2c/Makefile | 4 +
+ drivers/gpu/drm/i2c/ch7006_drv.c | 536 ++
+ drivers/gpu/drm/i2c/ch7006_mode.c | 468 ++
+ drivers/gpu/drm/i2c/ch7006_priv.h | 344 ++
+ drivers/gpu/drm/i810/i810_dma.c | 2 +-
+ drivers/gpu/drm/i810/i810_drv.c | 2 +-
+ drivers/gpu/drm/i830/i830_dma.c | 2 +-
+ drivers/gpu/drm/i830/i830_drv.c | 2 +-
+ drivers/gpu/drm/i915/Makefile | 2 +-
+ drivers/gpu/drm/i915/dvo_ch7017.c | 9 +-
+ drivers/gpu/drm/i915/dvo_ch7xxx.c | 16 +-
+ drivers/gpu/drm/i915/dvo_ivch.c | 37 +-
+ drivers/gpu/drm/i915/dvo_sil164.c | 20 +-
+ drivers/gpu/drm/i915/dvo_tfp410.c | 34 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 141 +-
+ drivers/gpu/drm/i915/i915_dma.c | 63 +-
+ drivers/gpu/drm/i915/i915_drv.c | 177 +-
+ drivers/gpu/drm/i915/i915_drv.h | 182 +-
+ drivers/gpu/drm/i915/i915_gem.c | 352 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 52 +-
+ drivers/gpu/drm/i915/i915_ioc32.c | 23 +-
+ drivers/gpu/drm/i915/i915_irq.c | 195 +-
+ drivers/gpu/drm/i915/i915_opregion.c | 92 +-
+ drivers/gpu/drm/i915/i915_reg.h | 78 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 86 +-
+ drivers/gpu/drm/i915/intel_bios.c | 137 +-
+ drivers/gpu/drm/i915/intel_bios.h | 17 +
+ drivers/gpu/drm/i915/intel_crt.c | 52 +-
+ drivers/gpu/drm/i915/intel_display.c | 1116 +++--
+ drivers/gpu/drm/i915/intel_dp.c | 162 +-
+ drivers/gpu/drm/i915/intel_dp.h | 144 -
+ drivers/gpu/drm/i915/intel_dp_i2c.c | 273 -
+ drivers/gpu/drm/i915/intel_drv.h | 44 +
+ drivers/gpu/drm/i915/intel_fb.c | 9 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 60 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 21 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 176 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 1416 ++++++
+ drivers/gpu/drm/i915/intel_sdvo.c | 19 +-
+ drivers/gpu/drm/i915/intel_tv.c | 49 +-
+ drivers/gpu/drm/mga/mga_drv.c | 2 +-
+ drivers/gpu/drm/mga/mga_ioc32.c | 13 +-
+ drivers/gpu/drm/nouveau/Kconfig | 44 +
+ drivers/gpu/drm/nouveau/Makefile | 32 +
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 125 +
+ drivers/gpu/drm/nouveau/nouveau_backlight.c | 155 +
+ drivers/gpu/drm/nouveau/nouveau_bios.c | 6078 +++++++++++++++++++++++
+ drivers/gpu/drm/nouveau/nouveau_bios.h | 290 ++
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 771 +++
+ drivers/gpu/drm/nouveau/nouveau_calc.c | 478 ++
+ drivers/gpu/drm/nouveau/nouveau_channel.c | 431 ++
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 824 +++
+ drivers/gpu/drm/nouveau/nouveau_connector.h | 54 +
+ drivers/gpu/drm/nouveau/nouveau_crtc.h | 95 +
+ drivers/gpu/drm/nouveau/nouveau_debugfs.c | 155 +
+ drivers/gpu/drm/nouveau/nouveau_display.c | 115 +
+ drivers/gpu/drm/nouveau/nouveau_dma.c | 226 +
+ drivers/gpu/drm/nouveau/nouveau_dma.h | 159 +
+ drivers/gpu/drm/nouveau/nouveau_dp.c | 569 +++
+ drivers/gpu/drm/nouveau/nouveau_drv.c | 409 ++
+ drivers/gpu/drm/nouveau/nouveau_drv.h | 1345 +++++
+ drivers/gpu/drm/nouveau/nouveau_encoder.h | 91 +
+ drivers/gpu/drm/nouveau/nouveau_fb.h | 47 +
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 389 ++
+ drivers/gpu/drm/nouveau/nouveau_fbcon.h | 48 +
+ drivers/gpu/drm/nouveau/nouveau_fence.c | 262 +
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 978 ++++
+ drivers/gpu/drm/nouveau/nouveau_grctx.c | 161 +
+ drivers/gpu/drm/nouveau/nouveau_grctx.h | 133 +
+ drivers/gpu/drm/nouveau/nouveau_hw.c | 1080 ++++
+ drivers/gpu/drm/nouveau/nouveau_hw.h | 455 ++
+ drivers/gpu/drm/nouveau/nouveau_i2c.c | 269 +
+ drivers/gpu/drm/nouveau/nouveau_i2c.h | 52 +
+ drivers/gpu/drm/nouveau/nouveau_ioc32.c | 70 +
+ drivers/gpu/drm/nouveau/nouveau_irq.c | 703 +++
+ drivers/gpu/drm/nouveau/nouveau_mem.c | 659 +++
+ drivers/gpu/drm/nouveau/nouveau_notifier.c | 196 +
+ drivers/gpu/drm/nouveau/nouveau_object.c | 1294 +++++
+ drivers/gpu/drm/nouveau/nouveau_reg.h | 836 ++++
+ drivers/gpu/drm/nouveau/nouveau_sgdma.c | 321 ++
+ drivers/gpu/drm/nouveau/nouveau_state.c | 871 ++++
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 103 +
+ drivers/gpu/drm/nouveau/nv04_crtc.c | 1002 ++++
+ drivers/gpu/drm/nouveau/nv04_cursor.c | 70 +
+ drivers/gpu/drm/nouveau/nv04_dac.c | 527 ++
+ drivers/gpu/drm/nouveau/nv04_dfp.c | 623 +++
+ drivers/gpu/drm/nouveau/nv04_display.c | 287 ++
+ drivers/gpu/drm/nouveau/nv04_fb.c | 21 +
+ drivers/gpu/drm/nouveau/nv04_fbcon.c | 315 ++
+ drivers/gpu/drm/nouveau/nv04_fifo.c | 305 ++
+ drivers/gpu/drm/nouveau/nv04_graph.c | 584 +++
+ drivers/gpu/drm/nouveau/nv04_instmem.c | 208 +
+ drivers/gpu/drm/nouveau/nv04_mc.c | 20 +
+ drivers/gpu/drm/nouveau/nv04_timer.c | 51 +
+ drivers/gpu/drm/nouveau/nv04_tv.c | 305 ++
+ drivers/gpu/drm/nouveau/nv10_fb.c | 44 +
+ drivers/gpu/drm/nouveau/nv10_fifo.c | 260 +
+ drivers/gpu/drm/nouveau/nv10_graph.c | 1009 ++++
+ drivers/gpu/drm/nouveau/nv17_gpio.c | 92 +
+ drivers/gpu/drm/nouveau/nv17_tv.c | 776 +++
+ drivers/gpu/drm/nouveau/nv17_tv.h | 156 +
+ drivers/gpu/drm/nouveau/nv17_tv_modes.c | 583 +++
+ drivers/gpu/drm/nouveau/nv20_graph.c | 775 +++
+ drivers/gpu/drm/nouveau/nv40_fb.c | 75 +
+ drivers/gpu/drm/nouveau/nv40_fifo.c | 314 ++
+ drivers/gpu/drm/nouveau/nv40_graph.c | 406 ++
+ drivers/gpu/drm/nouveau/nv40_grctx.c | 678 +++
+ drivers/gpu/drm/nouveau/nv40_mc.c | 38 +
+ drivers/gpu/drm/nouveau/nv50_crtc.c | 769 +++
+ drivers/gpu/drm/nouveau/nv50_cursor.c | 156 +
+ drivers/gpu/drm/nouveau/nv50_dac.c | 304 ++
+ drivers/gpu/drm/nouveau/nv50_display.c | 1032 ++++
+ drivers/gpu/drm/nouveau/nv50_display.h | 46 +
+ drivers/gpu/drm/nouveau/nv50_evo.h | 113 +
+ drivers/gpu/drm/nouveau/nv50_fbcon.c | 270 +
+ drivers/gpu/drm/nouveau/nv50_fifo.c | 492 ++
+ drivers/gpu/drm/nouveau/nv50_graph.c | 389 ++
+ drivers/gpu/drm/nouveau/nv50_instmem.c | 509 ++
+ drivers/gpu/drm/nouveau/nv50_mc.c | 40 +
+ drivers/gpu/drm/nouveau/nv50_sor.c | 309 ++
+ drivers/gpu/drm/nouveau/nvreg.h | 535 ++
+ drivers/gpu/drm/r128/r128_drv.c | 2 +-
+ drivers/gpu/drm/r128/r128_ioc32.c | 16 +-
+ drivers/gpu/drm/radeon/Makefile | 7 +-
+ drivers/gpu/drm/radeon/ObjectID.h | 801 ++--
+ drivers/gpu/drm/radeon/atom.c | 45 +-
+ drivers/gpu/drm/radeon/atom.h | 3 +
+ drivers/gpu/drm/radeon/atombios.h | 217 +-
+ drivers/gpu/drm/radeon/atombios_crtc.c | 57 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 792 +++
+ drivers/gpu/drm/radeon/mkregtable.c | 4 +-
+ drivers/gpu/drm/radeon/r100.c | 308 +-
+ drivers/gpu/drm/radeon/r100_track.h | 19 +-
+ drivers/gpu/drm/radeon/r200.c | 10 +-
+ drivers/gpu/drm/radeon/r300.c | 104 +-
+ drivers/gpu/drm/radeon/r300_cmdbuf.c | 6 +-
+ drivers/gpu/drm/radeon/r300_reg.h | 1 +
+ drivers/gpu/drm/radeon/r420.c | 66 +-
+ drivers/gpu/drm/radeon/r500_reg.h | 2 +
+ drivers/gpu/drm/radeon/r520.c | 9 +-
+ drivers/gpu/drm/radeon/r600.c | 1177 ++++-
+ drivers/gpu/drm/radeon/r600_audio.c | 267 +
+ drivers/gpu/drm/radeon/r600_blit_kms.c | 34 +-
+ drivers/gpu/drm/radeon/r600_cs.c | 4 +-
+ drivers/gpu/drm/radeon/r600_hdmi.c | 506 ++
+ drivers/gpu/drm/radeon/r600_reg.h | 74 +
+ drivers/gpu/drm/radeon/r600d.h | 212 +-
+ drivers/gpu/drm/radeon/radeon.h | 197 +-
+ drivers/gpu/drm/radeon/radeon_agp.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_asic.h | 65 +-
+ drivers/gpu/drm/radeon/radeon_atombios.c | 468 ++-
+ drivers/gpu/drm/radeon/radeon_benchmark.c | 36 +-
+ drivers/gpu/drm/radeon/radeon_clocks.c | 25 +-
+ drivers/gpu/drm/radeon/radeon_combios.c | 761 +++-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 221 +-
+ drivers/gpu/drm/radeon/radeon_cp.c | 46 +-
+ drivers/gpu/drm/radeon/radeon_cs.c | 13 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 148 +-
+ drivers/gpu/drm/radeon/radeon_display.c | 157 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 12 +-
+ drivers/gpu/drm/radeon/radeon_drv.h | 1 -
+ drivers/gpu/drm/radeon/radeon_encoders.c | 322 +-
+ drivers/gpu/drm/radeon/radeon_fb.c | 74 +-
+ drivers/gpu/drm/radeon/radeon_fence.c | 65 +-
+ drivers/gpu/drm/radeon/radeon_fixed.h | 17 +
+ drivers/gpu/drm/radeon/radeon_gart.c | 42 +-
+ drivers/gpu/drm/radeon/radeon_gem.c | 108 +-
[...1903 lines suppressed...]
return;
} else if (IS_G4X(dev)) {
uint32_t dspclk_gate;
-@@ -4314,11 +4521,37 @@ void intel_init_clock_gating(struct drm_device *dev)
+@@ -4237,11 +4522,37 @@ void intel_init_clock_gating(struct drm_device *dev)
dstate |= DSTATE_PLL_D3_OFF | DSTATE_GFX_CLOCK_GATING |
DSTATE_DOT_CLOCK_GATING;
I915_WRITE(D_STATE, dstate);
@@ -10076,7 +10064,7 @@ index f1de53b..002612f 100644
}
/* Set up chip specific display functions */
-@@ -4327,8 +4560,8 @@ static void intel_init_display(struct drm_device *dev)
+@@ -4250,8 +4561,8 @@ static void intel_init_display(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private;
/* We always want a DPMS function */
@@ -10087,7 +10075,7 @@ index f1de53b..002612f 100644
else
dev_priv->display.dpms = i9xx_crtc_dpms;
-@@ -4347,13 +4580,13 @@ static void intel_init_display(struct drm_device *dev)
+@@ -4270,13 +4581,13 @@ static void intel_init_display(struct drm_device *dev)
}
/* Returns the core display clock speed */
@@ -10103,7 +10091,7 @@ index f1de53b..002612f 100644
dev_priv->display.get_display_clock_speed =
i9xx_misc_get_display_clock_speed;
else if (IS_I915GM(dev))
-@@ -4362,7 +4595,7 @@ static void intel_init_display(struct drm_device *dev)
+@@ -4285,7 +4596,7 @@ static void intel_init_display(struct drm_device *dev)
else if (IS_I865G(dev))
dev_priv->display.get_display_clock_speed =
i865_get_display_clock_speed;
@@ -10112,7 +10100,7 @@ index f1de53b..002612f 100644
dev_priv->display.get_display_clock_speed =
i855_get_display_clock_speed;
else /* 852, 830 */
-@@ -4370,7 +4603,7 @@ static void intel_init_display(struct drm_device *dev)
+@@ -4293,7 +4604,7 @@ static void intel_init_display(struct drm_device *dev)
i830_get_display_clock_speed;
/* For FIFO watermark updates */
@@ -10121,7 +10109,7 @@ index f1de53b..002612f 100644
dev_priv->display.update_wm = NULL;
else if (IS_G4X(dev))
dev_priv->display.update_wm = g4x_update_wm;
-@@ -4426,7 +4659,7 @@ void intel_modeset_init(struct drm_device *dev)
+@@ -4349,7 +4660,7 @@ void intel_modeset_init(struct drm_device *dev)
num_pipe = 2;
else
num_pipe = 1;
@@ -10130,7 +10118,7 @@ index f1de53b..002612f 100644
num_pipe, num_pipe > 1 ? "s" : "");
if (IS_I85X(dev))
-@@ -4445,6 +4678,15 @@ void intel_modeset_init(struct drm_device *dev)
+@@ -4368,6 +4679,15 @@ void intel_modeset_init(struct drm_device *dev)
INIT_WORK(&dev_priv->idle_work, intel_idle_update);
setup_timer(&dev_priv->idle_timer, intel_gpu_idle_timer,
(unsigned long)dev);
@@ -10146,11 +10134,8 @@ index f1de53b..002612f 100644
}
void intel_modeset_cleanup(struct drm_device *dev)
-@@ -4465,14 +4707,23 @@ void intel_modeset_cleanup(struct drm_device *dev)
- del_timer_sync(&intel_crtc->idle_timer);
- }
+@@ -4390,11 +4710,21 @@ void intel_modeset_cleanup(struct drm_device *dev)
-- intel_increase_renderclock(dev, false);
del_timer_sync(&dev_priv->idle_timer);
- mutex_unlock(&dev->struct_mutex);
@@ -11180,7 +11165,7 @@ index c7eab72..8673c73 100644
intel_i2c_quirk_set(dev, true);
set_data(chan, 1);
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
-index 05598ae..f4b4aa2 100644
+index 0e0e4b4..f4b4aa2 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -56,7 +56,7 @@ static void intel_lvds_set_backlight(struct drm_device *dev, int level)
@@ -11278,22 +11263,7 @@ index 05598ae..f4b4aa2 100644
{ }
};
-@@ -679,7 +686,14 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
- struct drm_i915_private *dev_priv =
- container_of(nb, struct drm_i915_private, lid_notifier);
- struct drm_device *dev = dev_priv->dev;
-+ struct drm_connector *connector = dev_priv->int_lvds_connector;
-
-+ /*
-+ * check and update the status of LVDS connector after receiving
-+ * the LID nofication event.
-+ */
-+ if (connector)
-+ connector->status = connector->funcs->detect(connector);
- if (!acpi_lid_open()) {
- dev_priv->modeset_on_lid = 1;
- return NOTIFY_OK;
-@@ -854,64 +868,100 @@ static const struct dmi_system_id intel_no_lvds[] = {
+@@ -861,64 +868,100 @@ static const struct dmi_system_id intel_no_lvds[] = {
{ } /* terminating entry */
};
@@ -11439,7 +11409,7 @@ index 05598ae..f4b4aa2 100644
/**
* intel_lvds_init - setup LVDS connectors on this device
-@@ -936,21 +986,16 @@ void intel_lvds_init(struct drm_device *dev)
+@@ -943,21 +986,16 @@ void intel_lvds_init(struct drm_device *dev)
if (dmi_check_system(intel_no_lvds))
return;
@@ -11466,7 +11436,7 @@ index 05598ae..f4b4aa2 100644
return;
}
gpio = PCH_GPIOC;
-@@ -1023,6 +1068,7 @@ void intel_lvds_init(struct drm_device *dev)
+@@ -1030,6 +1068,7 @@ void intel_lvds_init(struct drm_device *dev)
dev_priv->panel_fixed_mode =
drm_mode_duplicate(dev, scan);
mutex_unlock(&dev->mode_config.mutex);
@@ -11474,7 +11444,7 @@ index 05598ae..f4b4aa2 100644
goto out;
}
mutex_unlock(&dev->mode_config.mutex);
-@@ -1047,8 +1093,8 @@ void intel_lvds_init(struct drm_device *dev)
+@@ -1054,8 +1093,8 @@ void intel_lvds_init(struct drm_device *dev)
* correct mode.
*/
@@ -11485,7 +11455,7 @@ index 05598ae..f4b4aa2 100644
goto failed;
lvds = I915_READ(LVDS);
-@@ -1069,7 +1115,7 @@ void intel_lvds_init(struct drm_device *dev)
+@@ -1076,7 +1115,7 @@ void intel_lvds_init(struct drm_device *dev)
goto failed;
out:
@@ -11494,7 +11464,7 @@ index 05598ae..f4b4aa2 100644
u32 pwm;
/* make sure PWM is enabled */
pwm = I915_READ(BLC_PWM_CPU_CTL2);
-@@ -1082,9 +1128,11 @@ out:
+@@ -1089,7 +1128,7 @@ out:
}
dev_priv->lid_notifier.notifier_call = intel_lid_notify;
if (acpi_lid_notifier_register(&dev_priv->lid_notifier)) {
@@ -11502,12 +11472,8 @@ index 05598ae..f4b4aa2 100644
+ DRM_DEBUG_KMS("lid notifier registration failed\n");
dev_priv->lid_notifier.notifier_call = NULL;
}
-+ /* keep the LVDS connector */
-+ dev_priv->int_lvds_connector = connector;
- drm_sysfs_connector_add(connector);
- return;
-
-@@ -1093,5 +1141,6 @@ failed:
+ /* keep the LVDS connector */
+@@ -1102,5 +1141,6 @@ failed:
if (intel_output->ddc_bus)
intel_i2c_destroy(intel_output->ddc_bus);
drm_connector_cleanup(connector);
@@ -79161,7 +79127,7 @@ index 7cb50bd..e3f46e0 100644
#ifndef __KERNEL__
typedef struct drm_clip_rect drm_clip_rect_t;
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 9d3d684..ffac157 100644
+index 7ad3faa..ffac157 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -245,16 +245,6 @@ extern void drm_ut_debug_printk(unsigned int request_level,
@@ -79323,15 +79289,6 @@ index 9d3d684..ffac157 100644
extern int drm_release(struct inode *inode, struct file *filp);
/* Mapping support (drm_vm.h) */
-@@ -1402,7 +1408,7 @@ extern int drm_ati_pcigart_cleanup(struct drm_device *dev,
- struct drm_ati_pcigart_info * gart_info);
-
- extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
-- size_t align, dma_addr_t maxaddr);
-+ size_t align);
- extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
- extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
-
@@ -1520,14 +1526,27 @@ static __inline__ void drm_core_dropmap(struct drm_local_map *map)
static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
@@ -82005,3 +81962,6 @@ index 0000000..2be7e12
+ */
+
+#endif
+--
+1.6.5.2
+
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1987
retrieving revision 1.1988
diff -u -p -r1.1987 -r1.1988
--- kernel.spec 18 Jan 2010 00:10:40 -0000 1.1987
+++ kernel.spec 18 Jan 2010 19:36:40 -0000 1.1988
@@ -40,7 +40,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 3
+%define stable_update 4
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -2027,6 +2027,10 @@ fi
# and build.
%changelog
+* Mon Jan 18 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.4-28
+- Linux stable 2.6.32.4
+- drm-upgrayedd: rebase for related changes in intel_display.c, i915_drv.h
+
* Mon Jan 18 2010 Ben Skeggs <bskeggs at redhat.com> 2.6.32.3-27
- various nouveau fixes from upstream
- dropped drm-nouveau-bios-paranoia.patch, it's upstream now
linux-2.6-execshield.patch:
arch/x86/include/asm/desc.h | 25 ++++++
arch/x86/include/asm/mmu.h | 7 +
arch/x86/include/asm/paravirt.h | 6 +
arch/x86/include/asm/paravirt_types.h | 3
arch/x86/include/asm/processor.h | 3
arch/x86/kernel/cpu/common.c | 14 +++
arch/x86/kernel/paravirt.c | 3
arch/x86/kernel/process_32.c | 48 ++++++++++++
arch/x86/kernel/traps.c | 129 +++++++++++++++++++++++++++++++---
arch/x86/mm/init.c | 6 +
arch/x86/mm/mmap.c | 5 +
arch/x86/mm/setup_nx.c | 4 +
arch/x86/mm/tlb.c | 7 +
arch/x86/vdso/vdso32-setup.c | 2
arch/x86/xen/enlighten.c | 21 +++++
fs/binfmt_elf.c | 21 ++++-
include/linux/mm.h | 8 +-
include/linux/mm_types.h | 3
include/linux/resource.h | 5 +
include/linux/sched.h | 7 +
kernel/sysctl.c | 28 +++++++
mm/mmap.c | 121 +++++++++++++++++++++++++++++--
mm/mprotect.c | 10 ++
mm/mremap.c | 4 -
24 files changed, 463 insertions(+), 27 deletions(-)
Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-execshield.patch,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- linux-2.6-execshield.patch 4 Jan 2010 15:44:12 -0000 1.110
+++ linux-2.6-execshield.patch 18 Jan 2010 19:36:40 -0000 1.111
@@ -774,7 +774,7 @@ index 73f5e4b..814b95f 100644
if (addr & ~PAGE_MASK)
return addr;
-@@ -1453,13 +1473,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1453,21 +1473,25 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
}
unsigned long
@@ -786,6 +786,14 @@ index 73f5e4b..814b95f 100644
unsigned long (*get_area)(struct file *, unsigned long,
unsigned long, unsigned long, unsigned long);
+ unsigned long error = arch_mmap_check(addr, len, flags);
+ if (error)
+ return error;
+
+ /* Careful about overflows.. */
+ if (len > TASK_SIZE)
+ return -ENOMEM;
+
- get_area = current->mm->get_unmapped_area;
+ if (exec && current->mm->get_unmapped_exec_area)
+ get_area = current->mm->get_unmapped_exec_area;
@@ -964,14 +972,16 @@ diff --git a/mm/mremap.c b/mm/mremap.c
index 97bff25..17a9fd7 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
-@@ -414,8 +414,8 @@ unsigned long do_mremap(unsigned long addr,
- if (vma->vm_flags & VM_MAYSHARE)
- map_flags |= MAP_SHARED;
-
-- new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
-- vma->vm_pgoff, map_flags);
-+ new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len,
-+ vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC);
- if (new_addr & ~PAGE_MASK) {
- ret = new_addr;
- goto out;
+@@ -414,10 +414,10 @@ unsigned long do_mremap(unsigned long addr,
+ if (vma->vm_flags & VM_MAYSHARE)
+ map_flags |= MAP_SHARED;
+
+- new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
++ new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len,
+ vma->vm_pgoff +
+ ((addr - vma->vm_start) >> PAGE_SHIFT),
+- map_flags);
++ map_flags, vma->vm_flags & VM_EXEC);
+ if (new_addr & ~PAGE_MASK) {
+ ret = new_addr;
+ goto out;
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1098
retrieving revision 1.1099
diff -u -p -r1.1098 -r1.1099
--- sources 7 Jan 2010 01:28:07 -0000 1.1098
+++ sources 18 Jan 2010 19:36:40 -0000 1.1099
@@ -1,2 +1,2 @@
260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
-6bd3c5fea1e88bb4d0948ec3688bd8f6 patch-2.6.32.3.bz2
+59ede83ff0fce786edacac028a457301 patch-2.6.32.4.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1012
retrieving revision 1.1013
diff -u -p -r1.1012 -r1.1013
--- upstream 7 Jan 2010 01:28:07 -0000 1.1012
+++ upstream 18 Jan 2010 19:36:40 -0000 1.1013
@@ -1,2 +1,2 @@
linux-2.6.32.tar.bz2
-patch-2.6.32.3.bz2
+patch-2.6.32.4.bz2
--- patch-2.6.32.3.bz2.sign DELETED ---
More information about the scm-commits
mailing list