rpms/kernel/devel patch-2.6.29-rc4-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.1012, 1.1013 drm-intel-next.patch, 1.2, 1.3 kernel.spec, 1.1286, 1.1287 linux-2.6-compile-fixes.patch, 1.192, 1.193 sources, 1.974, 1.975 upstream, 1.886, 1.887 patch-2.6.29-rc4-git1.bz2.sign, 1.1, NONE
Jarod Wilson
jwilson at fedoraproject.org
Wed Feb 11 14:55:54 UTC 2009
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6611
Modified Files:
.cvsignore drm-intel-next.patch kernel.spec
linux-2.6-compile-fixes.patch sources upstream
Added Files:
patch-2.6.29-rc4-git3.bz2.sign
Removed Files:
patch-2.6.29-rc4-git1.bz2.sign
Log Message:
* Wed Feb 11 2009 Jarod Wilson <jarod at redhat.com> 2.6.29-0.107.rc4.git3
- 2.6.29-rc4-git3
- Hey, look, that bumpspec thingy actually worked, here's proof!
--- NEW FILE patch-2.6.29-rc4-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBJkhV7yGugalF9Dw4RAioNAJ0fUYJ7Tj9KhFs7bZHcx6Dyu2JjcQCffALV
BqHN7HWcHTFJLXs2KfyM8j0=
=TKZN
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1012
retrieving revision 1.1013
diff -u -r1.1012 -r1.1013
--- .cvsignore 9 Feb 2009 04:37:17 -0000 1.1012
+++ .cvsignore 11 Feb 2009 14:55:23 -0000 1.1013
@@ -5,4 +5,4 @@
kernel-2.6.28
linux-2.6.28.tar.bz2
patch-2.6.29-rc4.bz2
-patch-2.6.29-rc4-git1.bz2
+patch-2.6.29-rc4-git3.bz2
drm-intel-next.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 drm-intel-next.patch
Index: drm-intel-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-next.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drm-intel-next.patch 9 Feb 2009 15:45:33 -0000 1.2
+++ drm-intel-next.patch 11 Feb 2009 14:55:23 -0000 1.3
@@ -51,126 +51,6 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 9ac37e9d74785997abdd344866b648dd213aae04
-Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Wed Feb 4 14:15:10 2009 +0000
-
- drm/i915: Unlock mutex on i915_gem_fault() error path
-
- If we failed to allocate a new fence register we would return
- VM_FAULT_SIGBUS without relinquishing the lock.
-
- Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
- Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit b389fc443443504133eceea2ddbdf76e7ffa984b
-Author: Eric Anholt <eric at anholt.net>
-Date: Tue Feb 3 12:10:21 2009 -0800
-
- drm/i915: Quiet the message on get/setparam ioctl with an unknown value.
-
- Getting an unknown get/setparam used to be more significant back when they
- didn't change much. However, now that we're in the git world we're using
- them instead of a monotonic version number to signal feature availability,
- so clients ask about unknown params on older kernels more often.
-
- Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit 97dd93c127cf7b9111021692cb9f9bea90a0e27d
-Author: Paul Collins <paul at burly.ondioline.org>
-Date: Wed Feb 4 23:05:41 2009 +1300
-
- drm/i915: skip LVDS initialization on Apple Mac Mini
-
- The Apple Mac Mini falsely reports LVDS. Use DMI to check whether we
- are running on a Mac Mini, and skip LVDS initialization if that proves
- to be the case.
-
- Signed-off-by: Paul Collins <paul at ondioline.org>
- Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit 1ef1df8f7005b3f83133483e9418a8f7e3398e0e
-Author: Jesse Barnes <jbarnes at virtuousgeek.org>
-Date: Mon Feb 2 15:11:52 2009 -0800
-
- drm/i915: sync SDVO code with stable userland modesetting driver
-
- Pull in an update from the 2D driver (hopefully the last one, future work
- should be done here and pulled back into xf86-video-intel as needed).
-
- Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
- Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit 3816120bf8c411aff71b0e3023a56b56b129beab
-Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Fri Jan 30 21:10:22 2009 +0000
-
- drm/i915: Unref the object after failing to set tiling mode.
-
- Cleanup the object reference on the error paths.
-
- Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
- Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit 25085cd0a13678664cc1764eecc01612fa9cc1ea
-Author: Jesse Barnes <jbarnes at virtuousgeek.org>
-Date: Mon Jan 26 17:10:45 2009 -0800
-
- drm/i915: add fence register management to execbuf
-
- Adds code to set up fence registers at execbuf time on pre-965 chips as
- necessary. Also fixes up a few bugs in the pre-965 tile register support
- (get_order != ffs). The number of fences available to the kernel defaults
- to the hw limit minus 3 (for legacy X front/back/depth), but a new parameter
- allows userspace to override that as needed.
-
- Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
- Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit 17edf961e82572818f15da3e93a6b73c7a7efde7
-Author: Eric Anholt <eric at anholt.net>
-Date: Tue Jan 27 10:33:49 2009 -0800
-
- drm/i915: Return error from i915_gem_object_get_fence_reg() when failing.
-
- Previously, the caller would continue along without knowing that the
- function failed, resulting in potential mis-rendering. Right now vm_fault
- just returns SIGBUS in that case, and we may need to disable signal handling
- to avoid that happening.
-
- Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit 5cb87d8fd402d84b83dc24dfa43e373690c3c66c
-Author: Eric Anholt <eric at anholt.net>
-Date: Fri Jan 23 12:57:47 2009 -0800
-
- drm/i915: Set up an MTRR covering the GTT at driver load.
-
- We'd love to just be using PAT, but even on chips with PAT it gets disabled
- sometimes due to an errata. It would probably be better to have pat_enabled
- exported and only bother with this when !pat_enabled.
-
- Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit 0c7cfd3b9c67afb575fef6c9989f2dcb1ea4fdf8
-Author: Eric Anholt <eric at anholt.net>
-Date: Thu Jan 22 13:01:02 2009 -0800
-
- drm/i915: Skip SDVO/HDMI init when the chipset tells us it's not present.
-
- This saves startup time from probing SDVO, and saves setting up HDMI outputs
- on G4X devices that don't have them.
-
-commit f0299ef4ff77278599a1eaf78179f4c8b5c10820
-Author: Eric Anholt <eric at anholt.net>
-Date: Thu Jan 22 09:56:58 2009 -0800
-
- drm/i915: Suppress GEM teardown on X Server exit in KMS mode.
-
- Fixes hangs when starting X for the second time.
-
- Signed-off-by: Eric Anholt <eric at anholt.net>
-
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 964c5eb..40c60de 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
@@ -317,550 +197,6 @@
fail_no_encoder:
kfree(save_crtcs);
count = 0;
-diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index ee64b73..0ded483 100644
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -731,8 +731,11 @@ static int i915_getparam(struct drm_device *dev, void *data,
- case I915_PARAM_HAS_GEM:
- value = dev_priv->has_gem;
- break;
-+ case I915_PARAM_NUM_FENCES_AVAIL:
-+ value = dev_priv->num_fence_regs - dev_priv->fence_reg_start;
-+ break;
- default:
-- DRM_ERROR("Unknown parameter %d\n", param->param);
-+ DRM_DEBUG("Unknown parameter %d\n", param->param);
- return -EINVAL;
- }
-
-@@ -764,8 +767,15 @@ static int i915_setparam(struct drm_device *dev, void *data,
- case I915_SETPARAM_ALLOW_BATCHBUFFER:
- dev_priv->allow_batchbuffer = param->value;
- break;
-+ case I915_SETPARAM_NUM_USED_FENCES:
-+ if (param->value > dev_priv->num_fence_regs ||
-+ param->value < 0)
-+ return -EINVAL;
-+ /* Userspace can use first N regs */
-+ dev_priv->fence_reg_start = param->value;
-+ break;
- default:
-- DRM_ERROR("unknown parameter %d\n", param->param);
-+ DRM_DEBUG("unknown parameter %d\n", param->param);
- return -EINVAL;
- }
-
-@@ -966,10 +976,6 @@ static int i915_load_modeset_init(struct drm_device *dev)
- if (ret)
- goto kfree_devname;
-
-- dev_priv->mm.gtt_mapping =
-- io_mapping_create_wc(dev->agp->base,
-- dev->agp->agp_info.aper_size * 1024*1024);
--
- /* Allow hardware batchbuffers unless told otherwise.
- */
- dev_priv->allow_batchbuffer = 1;
-@@ -1081,6 +1087,23 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
- goto free_priv;
- }
-
-+ dev_priv->mm.gtt_mapping =
-+ io_mapping_create_wc(dev->agp->base,
-+ dev->agp->agp_info.aper_size * 1024*1024);
-+ /* Set up a WC MTRR for non-PAT systems. This is more common than
-+ * one would think, because the kernel disables PAT on first
-+ * generation Core chips because WC PAT gets overridden by a UC
-+ * MTRR if present. Even if a UC MTRR isn't present.
-+ */
-+ dev_priv->mm.gtt_mtrr = mtrr_add(dev->agp->base,
-+ dev->agp->agp_info.aper_size *
-+ 1024 * 1024,
-+ MTRR_TYPE_WRCOMB, 1);
[...1902 lines suppressed...]
-+} __attribute__((packed));
-+
-+#define SDVO_CMD_GET_MAX_BACKLIGHT_LEVEL 0x30
-+struct sdvo_max_backlight_reply {
-+ u8 max_value;
-+ u8 default_value;
-+} __attribute__((packed));
-+
-+#define SDVO_CMD_GET_BACKLIGHT_LEVEL 0x31
-+#define SDVO_CMD_SET_BACKLIGHT_LEVEL 0x32
-+
-+#define SDVO_CMD_GET_AMBIENT_LIGHT 0x33
-+struct sdvo_get_ambient_light_reply {
-+ u16 trip_low;
-+ u16 trip_high;
-+ u16 value;
-+} __attribute__((packed));
-+#define SDVO_CMD_SET_AMBIENT_LIGHT 0x34
-+struct sdvo_set_ambient_light_reply {
-+ u16 trip_low;
-+ u16 trip_high;
-+ unsigned int enable:1;
-+ unsigned int pad:7;
-+} __attribute__((packed));
-+
-+/* Set display power state */
-+#define SDVO_CMD_SET_DISPLAY_POWER_STATE 0x7d
-+# define SDVO_DISPLAY_STATE_ON (1 << 0)
-+# define SDVO_DISPLAY_STATE_STANDBY (1 << 1)
-+# define SDVO_DISPLAY_STATE_SUSPEND (1 << 2)
-+# define SDVO_DISPLAY_STATE_OFF (1 << 3)
-+
-+#define SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS 0x84
-+struct intel_sdvo_enhancements_reply {
-+ unsigned int flicker_filter:1;
-+ unsigned int flicker_filter_adaptive:1;
-+ unsigned int flicker_filter_2d:1;
-+ unsigned int saturation:1;
-+ unsigned int hue:1;
-+ unsigned int brightness:1;
-+ unsigned int contrast:1;
-+ unsigned int overscan_h:1;
-+
-+ unsigned int overscan_v:1;
-+ unsigned int position_h:1;
-+ unsigned int position_v:1;
-+ unsigned int sharpness:1;
-+ unsigned int dot_crawl:1;
-+ unsigned int dither:1;
-+ unsigned int max_tv_chroma_filter:1;
-+ unsigned int max_tv_luma_filter:1;
-+} __attribute__((packed));
-+
-+/* Picture enhancement limits below are dependent on the current TV format,
-+ * and thus need to be queried and set after it.
-+ */
-+#define SDVO_CMD_GET_MAX_FLICKER_FITER 0x4d
-+#define SDVO_CMD_GET_MAX_ADAPTIVE_FLICKER_FITER 0x7b
-+#define SDVO_CMD_GET_MAX_2D_FLICKER_FITER 0x52
-+#define SDVO_CMD_GET_MAX_SATURATION 0x55
-+#define SDVO_CMD_GET_MAX_HUE 0x58
-+#define SDVO_CMD_GET_MAX_BRIGHTNESS 0x5b
-+#define SDVO_CMD_GET_MAX_CONTRAST 0x5e
-+#define SDVO_CMD_GET_MAX_OVERSCAN_H 0x61
-+#define SDVO_CMD_GET_MAX_OVERSCAN_V 0x64
-+#define SDVO_CMD_GET_MAX_POSITION_H 0x67
-+#define SDVO_CMD_GET_MAX_POSITION_V 0x6a
-+#define SDVO_CMD_GET_MAX_SHARPNESS_V 0x6d
-+#define SDVO_CMD_GET_MAX_TV_CHROMA 0x74
-+#define SDVO_CMD_GET_MAX_TV_LUMA 0x77
-+struct intel_sdvo_enhancement_limits_reply {
-+ u16 max_value;
-+ u16 default_value;
-+} __attribute__((packed));
-
--#define SDVO_CMD_SET_TV_RESOLUTION_SUPPORT 0x93
-+#define SDVO_CMD_GET_LVDS_PANEL_INFORMATION 0x7f
-+#define SDVO_CMD_SET_LVDS_PANEL_INFORMATION 0x80
-+# define SDVO_LVDS_COLOR_DEPTH_18 (0 << 0)
-+# define SDVO_LVDS_COLOR_DEPTH_24 (1 << 0)
-+# define SDVO_LVDS_CONNECTOR_SPWG (0 << 2)
-+# define SDVO_LVDS_CONNECTOR_OPENLDI (1 << 2)
-+# define SDVO_LVDS_SINGLE_CHANNEL (0 << 4)
-+# define SDVO_LVDS_DUAL_CHANNEL (1 << 4)
-+
-+#define SDVO_CMD_GET_FLICKER_FILTER 0x4e
-+#define SDVO_CMD_SET_FLICKER_FILTER 0x4f
-+#define SDVO_CMD_GET_ADAPTIVE_FLICKER_FITER 0x50
-+#define SDVO_CMD_SET_ADAPTIVE_FLICKER_FITER 0x51
-+#define SDVO_CMD_GET_2D_FLICKER_FITER 0x53
-+#define SDVO_CMD_SET_2D_FLICKER_FITER 0x54
-+#define SDVO_CMD_GET_SATURATION 0x56
-+#define SDVO_CMD_SET_SATURATION 0x57
-+#define SDVO_CMD_GET_HUE 0x59
-+#define SDVO_CMD_SET_HUE 0x5a
-+#define SDVO_CMD_GET_BRIGHTNESS 0x5c
-+#define SDVO_CMD_SET_BRIGHTNESS 0x5d
-+#define SDVO_CMD_GET_CONTRAST 0x5f
-+#define SDVO_CMD_SET_CONTRAST 0x60
-+#define SDVO_CMD_GET_OVERSCAN_H 0x62
-+#define SDVO_CMD_SET_OVERSCAN_H 0x63
-+#define SDVO_CMD_GET_OVERSCAN_V 0x65
-+#define SDVO_CMD_SET_OVERSCAN_V 0x66
-+#define SDVO_CMD_GET_POSITION_H 0x68
-+#define SDVO_CMD_SET_POSITION_H 0x69
-+#define SDVO_CMD_GET_POSITION_V 0x6b
-+#define SDVO_CMD_SET_POSITION_V 0x6c
-+#define SDVO_CMD_GET_SHARPNESS 0x6e
-+#define SDVO_CMD_SET_SHARPNESS 0x6f
-+#define SDVO_CMD_GET_TV_CHROMA 0x75
-+#define SDVO_CMD_SET_TV_CHROMA 0x76
-+#define SDVO_CMD_GET_TV_LUMA 0x78
-+#define SDVO_CMD_SET_TV_LUMA 0x79
-+struct intel_sdvo_enhancements_arg {
-+ u16 value;
-+}__attribute__((packed));
-+
-+#define SDVO_CMD_GET_DOT_CRAWL 0x70
-+#define SDVO_CMD_SET_DOT_CRAWL 0x71
-+# define SDVO_DOT_CRAWL_ON (1 << 0)
-+# define SDVO_DOT_CRAWL_DEFAULT_ON (1 << 1)
-+
-+#define SDVO_CMD_GET_DITHER 0x72
-+#define SDVO_CMD_SET_DITHER 0x73
-+# define SDVO_DITHER_ON (1 << 0)
-+# define SDVO_DITHER_DEFAULT_ON (1 << 1)
-
- #define SDVO_CMD_SET_CONTROL_BUS_SWITCH 0x7a
--# define SDVO_CONTROL_BUS_PROM 0x0
--# define SDVO_CONTROL_BUS_DDC1 0x1
--# define SDVO_CONTROL_BUS_DDC2 0x2
--# define SDVO_CONTROL_BUS_DDC3 0x3
-+# define SDVO_CONTROL_BUS_PROM (1 << 0)
-+# define SDVO_CONTROL_BUS_DDC1 (1 << 1)
-+# define SDVO_CONTROL_BUS_DDC2 (1 << 2)
-+# define SDVO_CONTROL_BUS_DDC3 (1 << 3)
-+
-+/* HDMI op codes */
-+#define SDVO_CMD_GET_SUPP_ENCODE 0x9d
-+#define SDVO_CMD_GET_ENCODE 0x9e
-+#define SDVO_CMD_SET_ENCODE 0x9f
-+ #define SDVO_ENCODE_DVI 0x0
-+ #define SDVO_ENCODE_HDMI 0x1
-+#define SDVO_CMD_SET_PIXEL_REPLI 0x8b
-+#define SDVO_CMD_GET_PIXEL_REPLI 0x8c
-+#define SDVO_CMD_GET_COLORIMETRY_CAP 0x8d
-+#define SDVO_CMD_SET_COLORIMETRY 0x8e
-+ #define SDVO_COLORIMETRY_RGB256 0x0
-+ #define SDVO_COLORIMETRY_RGB220 0x1
-+ #define SDVO_COLORIMETRY_YCrCb422 0x3
-+ #define SDVO_COLORIMETRY_YCrCb444 0x4
-+#define SDVO_CMD_GET_COLORIMETRY 0x8f
-+#define SDVO_CMD_GET_AUDIO_ENCRYPT_PREFER 0x90
-+#define SDVO_CMD_SET_AUDIO_STAT 0x91
-+#define SDVO_CMD_GET_AUDIO_STAT 0x92
-+#define SDVO_CMD_SET_HBUF_INDEX 0x93
-+#define SDVO_CMD_GET_HBUF_INDEX 0x94
-+#define SDVO_CMD_GET_HBUF_INFO 0x95
-+#define SDVO_CMD_SET_HBUF_AV_SPLIT 0x96
-+#define SDVO_CMD_GET_HBUF_AV_SPLIT 0x97
-+#define SDVO_CMD_SET_HBUF_DATA 0x98
-+#define SDVO_CMD_GET_HBUF_DATA 0x99
-+#define SDVO_CMD_SET_HBUF_TXRATE 0x9a
-+#define SDVO_CMD_GET_HBUF_TXRATE 0x9b
-+ #define SDVO_HBUF_TX_DISABLED (0 << 6)
-+ #define SDVO_HBUF_TX_ONCE (2 << 6)
-+ #define SDVO_HBUF_TX_VSYNC (3 << 6)
-+#define SDVO_CMD_GET_AUDIO_TX_INFO 0x9c
-+
-+struct intel_sdvo_encode{
-+ u8 dvi_rev;
-+ u8 hdmi_rev;
-+} __attribute__ ((packed));
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index 0c6f0e1..28ff3ee 100644
--- a/include/drm/drm_crtc_helper.h
@@ -2537,23 +288,3 @@
/* detect for DAC style encoders */
enum drm_connector_status (*detect)(struct drm_encoder *encoder,
struct drm_connector *connector);
-diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index b3bcf72..912cd52 100644
---- a/include/drm/i915_drm.h
-+++ b/include/drm/i915_drm.h
-@@ -261,6 +261,7 @@ typedef struct drm_i915_irq_wait {
- #define I915_PARAM_LAST_DISPATCH 3
- #define I915_PARAM_CHIPSET_ID 4
- #define I915_PARAM_HAS_GEM 5
-+#define I915_PARAM_NUM_FENCES_AVAIL 6
-
- typedef struct drm_i915_getparam {
- int param;
-@@ -272,6 +273,7 @@ typedef struct drm_i915_getparam {
- #define I915_SETPARAM_USE_MI_BATCHBUFFER_START 1
- #define I915_SETPARAM_TEX_LRU_LOG_GRANULARITY 2
- #define I915_SETPARAM_ALLOW_BATCHBUFFER 3
-+#define I915_SETPARAM_NUM_USED_FENCES 4
-
- typedef struct drm_i915_setparam {
- int param;
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1286
retrieving revision 1.1287
diff -u -r1.1286 -r1.1287
--- kernel.spec 11 Feb 2009 04:35:13 -0000 1.1286
+++ kernel.spec 11 Feb 2009 14:55:24 -0000 1.1287
@@ -58,7 +58,7 @@
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 1
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1749,6 +1749,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Wed Feb 11 2009 Jarod Wilson <jarod at redhat.com> 2.6.29-0.107.rc4.git3
+- 2.6.29-rc4-git3
+
* Wed Feb 11 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau update: GeForce 9 support, kms fixes improvements
linux-2.6-compile-fixes.patch:
Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- linux-2.6-compile-fixes.patch 8 Feb 2009 18:15:10 -0000 1.192
+++ linux-2.6-compile-fixes.patch 11 Feb 2009 14:55:24 -0000 1.193
@@ -4,77 +4,3 @@
# Please add the errors from gcc before the diffs to save others having
# to do a compile to figure out what your diff is fixing. Thanks.
#
-From: Kyle McMartin <kyle at redhat.com>
-
-Architectures other than mips and x86 are not using ticket
-spinlocks. Therefore, the contention on the lock is meaningless,
-since there is nobody known to be waiting on it (arguably /fairly/
-unfair locks) Dummy it out to return 0 on other architectures.
-
-Signed-off-by: Kyle McMartin <kyle at redhat.com>
----
-
-fixes:
- btrfs does not build on ppc64
- http://marc.info/?l=linux-kernel&m=123404002114219&w=2
- fs/btrfs/locking.c: In function 'btrfs_path_lock_waiting':
- fs/btrfs/locking.c:254: error: implicit declaration of function '__raw_spin_is_contended'
-
- arch/mips/include/asm/spinlock.h | 1 +
- arch/x86/include/asm/paravirt.h | 1 +
- arch/x86/include/asm/spinlock.h | 1 +
- include/linux/spinlock.h | 5 +++++
- 4 files changed, 8 insertions(+), 0 deletions(-)
-diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h
-index 1a1f320..0884947 100644
---- a/arch/mips/include/asm/spinlock.h
-+++ b/arch/mips/include/asm/spinlock.h
-@@ -51,6 +51,7 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
-
- return (((counters >> 14) - counters) & 0x1fff) > 1;
- }
-+#define __raw_spin_is_contended __raw_spin_is_contended
-
- static inline void __raw_spin_lock(raw_spinlock_t *lock)
- {
-diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index ba3e2ff..c09a141 100644
---- a/arch/x86/include/asm/paravirt.h
-+++ b/arch/x86/include/asm/paravirt.h
-@@ -1402,6 +1402,7 @@ static inline int __raw_spin_is_contended(struct raw_spinlock *lock)
- {
- return PVOP_CALL1(int, pv_lock_ops.spin_is_contended, lock);
- }
-+#define __raw_spin_is_contended __raw_spin_is_contended
-
- static __always_inline void __raw_spin_lock(struct raw_spinlock *lock)
- {
-diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
-index d17c919..8247e94 100644
---- a/arch/x86/include/asm/spinlock.h
-+++ b/arch/x86/include/asm/spinlock.h
-@@ -245,6 +245,7 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
- {
- return __ticket_spin_is_contended(lock);
- }
-+#define __raw_spin_is_contended __raw_spin_is_contended
-
- static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
- {
-diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
-index e0c0fcc..a0c66a2 100644
---- a/include/linux/spinlock.h
-+++ b/include/linux/spinlock.h
-@@ -124,7 +124,12 @@ do { \
- #ifdef CONFIG_GENERIC_LOCKBREAK
- #define spin_is_contended(lock) ((lock)->break_lock)
- #else
-+
-+#ifdef __raw_spin_is_contended
- #define spin_is_contended(lock) __raw_spin_is_contended(&(lock)->raw_lock)
-+#else
-+#define spin_is_contended(lock) (((void)(lock), 0))
-+#endif /*__raw_spin_is_contended*/
- #endif
-
- /**
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -r1.974 -r1.975
--- sources 9 Feb 2009 04:37:17 -0000 1.974
+++ sources 11 Feb 2009 14:55:24 -0000 1.975
@@ -1,3 +1,3 @@
d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2
c5daf3d0f43873d5c2b36ddaf8d77bab patch-2.6.29-rc4.bz2
-7fcdf5fa892e19bb1b617304d78c47f0 patch-2.6.29-rc4-git1.bz2
+a5f097549ed9050d718f9d6719e452f0 patch-2.6.29-rc4-git3.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.886
retrieving revision 1.887
diff -u -r1.886 -r1.887
--- upstream 9 Feb 2009 04:37:17 -0000 1.886
+++ upstream 11 Feb 2009 14:55:24 -0000 1.887
@@ -1,3 +1,3 @@
linux-2.6.28.tar.bz2
patch-2.6.29-rc4.bz2
-patch-2.6.29-rc4-git1.bz2
+patch-2.6.29-rc4-git3.bz2
--- patch-2.6.29-rc4-git1.bz2.sign DELETED ---
More information about the scm-commits
mailing list