rpms/kernel/devel patch-2.6.29-rc6.bz2.sign, NONE, 1.1.2.2 .cvsignore, 1.1014.2.2, 1.1014.2.3 Makefile, 1.97, 1.97.6.1 config-generic, 1.238.6.3, 1.238.6.4 config-x86_64-generic, 1.68.2.1, 1.68.2.2 drm-modesetting-radeon.patch, 1.54, 1.54.6.1 kernel.spec, 1.1294.2.3, 1.1294.2.4 sources, 1.976.2.3, 1.976.2.4 upstream, 1.888.2.2, 1.888.2.3 xen.pvops.patch, 1.1.2.3, 1.1.2.4 drm-intel-suspend.patch, 1.1.2.2, NONE drm-modesetting-radeon-pciid.patch, 1.1.2.2, NONE drm-next.patch, 1.6, NONE patch-2.6.29-rc5-git4.bz2.sign, 1.1.2.2, NONE patch-2.6.29-rc5.bz2.sign, 1.1.2.2, NONE
Michael Young
myoung at fedoraproject.org
Mon Feb 23 20:07:40 UTC 2009
Author: myoung
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2543
Modified Files:
Tag: private-myoung-dom0-branch
.cvsignore Makefile config-generic config-x86_64-generic
drm-modesetting-radeon.patch kernel.spec sources upstream
xen.pvops.patch
Added Files:
Tag: private-myoung-dom0-branch
patch-2.6.29-rc6.bz2.sign
Removed Files:
Tag: private-myoung-dom0-branch
drm-intel-suspend.patch drm-modesetting-radeon-pciid.patch
drm-next.patch patch-2.6.29-rc5-git4.bz2.sign
patch-2.6.29-rc5.bz2.sign
Log Message:
update xen pvops patch and unset some options that xen doesn't like
--- NEW FILE patch-2.6.29-rc6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBJoiiKyGugalF9Dw4RAlpdAJ4j5OowJYKawRud/sENIGHEouY0LgCcDmhc
EUCJWREfijZ67yQD6eIyUtQ=
=xMvZ
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.2
retrieving revision 1.1014.2.3
diff -u -r1.1014.2.2 -r1.1014.2.3
--- .cvsignore 21 Feb 2009 16:05:49 -0000 1.1014.2.2
+++ .cvsignore 23 Feb 2009 20:07:04 -0000 1.1014.2.3
@@ -4,5 +4,4 @@
temp-*
kernel-2.6.28
linux-2.6.28.tar.bz2
-patch-2.6.29-rc5.bz2
-patch-2.6.29-rc5-git4.bz2
+patch-2.6.29-rc6.bz2
Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.97
retrieving revision 1.97.6.1
diff -u -r1.97 -r1.97.6.1
--- Makefile 5 Feb 2009 18:55:52 -0000 1.97
+++ Makefile 23 Feb 2009 20:07:04 -0000 1.97.6.1
@@ -114,6 +114,7 @@
@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
+ @perl -pi -e 's/^%define rawhide_skip_docs 1/%define rawhide_skip_docs 0/' kernel.spec
rhel:
@perl -pi -e 's/# CONFIG_PPC_64K_PAGES is not set/CONFIG_PPC_64K_PAGES=y/' config-powerpc64
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.3
retrieving revision 1.238.6.4
diff -u -r1.238.6.3 -r1.238.6.4
--- config-generic 21 Feb 2009 16:05:55 -0000 1.238.6.3
+++ config-generic 23 Feb 2009 20:07:04 -0000 1.238.6.4
@@ -79,7 +79,7 @@
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
-CONFIG_PCI_MSI=y
+# CONFIG_PCI_MSI is not set
CONFIG_PCI_MSI_DEFAULT_ON=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCIEAER=y
@@ -3942,3 +3942,4 @@
CONFIG_XEN_BLKDEV_BACKEND=y
CONFIG_XEN_NETDEV_BACKEND=y
# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_X86_X2APIC is not set
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.68.2.1
retrieving revision 1.68.2.2
diff -u -r1.68.2.1 -r1.68.2.2
--- config-x86_64-generic 17 Feb 2009 22:10:50 -0000 1.68.2.1
+++ config-x86_64-generic 23 Feb 2009 20:07:04 -0000 1.68.2.2
@@ -225,7 +225,7 @@
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_CS5535 is not set
-CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_CC_STACKPROTECTOR_ALL is not set
CONFIG_SGI_IOC4=m
@@ -309,7 +309,7 @@
CONFIG_DIRECT_GBPAGES=y
# CONFIG_MEMTEST is not set
-CONFIG_AMD_IOMMU=y
+# CONFIG_AMD_IOMMU is not set
CONFIG_AMD_IOMMU_STATS=y
# CONFIG_MAXSMP is not set
CONFIG_MTRR_SANITIZER=y
drm-modesetting-radeon.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.54 -r 1.54.6.1 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.54
retrieving revision 1.54.6.1
diff -u -r1.54 -r1.54.6.1
--- drm-modesetting-radeon.patch 27 Jan 2009 03:09:18 -0000 1.54
+++ drm-modesetting-radeon.patch 23 Feb 2009 20:07:04 -0000 1.54.6.1
@@ -1,5 +1,1392 @@
+commit 465937aec83364d3cf516bc8b6c2ca7f785892d9
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Feb 22 08:22:14 2009 +1000
+
+ radeon: add module IDs
+
+commit dd6dc3d83534ae6ae908629cfe0d1a784e073102
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Feb 22 08:19:33 2009 +1000
+
+ radeon: fixup for new APIs
+
+commit a93e118253bdf74092233dbc21d3e257688f39c8
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Feb 22 08:11:33 2009 +1000
+
+ drm: fix parmeter passed to fb_release
+
+commit 2b6628ce5e481e1ff5a30d8957d7b32fd5b4d1e1
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Feb 18 17:36:33 2009 +1000
+
+ radeon: add IB dumping
+
+ this adds basic IB dumping and cleans up some code around it.
+
+commit cb1fedbb2df6da2f104a026c7846dfc91564e2f7
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Feb 18 11:12:19 2009 +1000
+
+ radeon: fix packet2 parsing + enhance debug
+
+commit c3e00f3af01659590ef278d822ef0a727faf4f71
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Feb 18 11:11:39 2009 +1000
+
+ radeon: use r100/r200 table to setup the regs database
+
+ This takes the packet table from the older CS method and re-uses it to
+ setup the valid register table.
+
+ It also doesn't or in the table values but sets them
+
+commit c4c20e2f1e60bb507e1b2c5f1e9d2c26497df171
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Feb 17 20:57:34 2009 +1000
+
+ radeon/i2c: i2c adapter id is gone
+
+commit c15cf36a1ecd6ddc99c453d4fbf0b88a812c8f72
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Jan 22 17:15:56 2009 +1000
+
+ drm: fix radeon Kconfig
+
+commit 36e00f39abecac799b7d53122e35ec1098245c45
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Jan 11 19:50:23 2009 +1000
+
+ radeon: add missing Kconfig text
+
+commit d7d278645bf22fa609a3442bd105539e67977f39
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Jan 11 19:47:39 2009 +1000
+
+ drm: fix merge issue that messes up irq
+
+commit cad74b7853b75c0e10b2958d933518921e194265
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sat Jan 10 12:40:42 2009 +1000
+
+ radeon: add getparam to get pci device from userspace
+
+commit 97859845b7216b86003a1bb0533d1f5cf43a0c04
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Dec 18 23:01:12 2008 +1000
+
+ drm: don't set cached bits on pages from uncached allocator.
+
+ This should make AGP no corrupt itself to all buggery
+ (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460)
+
+commit 5b1ded493702a6807d0e6718fe17a78b573cdd36
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Dec 2 16:38:04 2008 +1000
+
+ drop old CS
+
+commit 5a569665167ed400fbef07ff5ce6fb106a2d3576
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Dec 1 15:09:27 2008 +1000
+
+ radeon: update with latest CS bits
+
+commit 19518b82b4fc4fb0b2093efb29658e36169b7c0a
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Dec 17 06:56:36 2008 +1000
+
+ fixups post rebase
+
+commit 2d40852fce298ef27f2983a5d3aa0259ab3c0022
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Dec 11 01:35:09 2008 +1000
+
+ radeon: fix agp mode when kms isn't enabled
+
+commit 3ca5ac03d32dd106a652e67e04a1533080d382fd
+Author: Dave Airlie <airlied at ppcg5.localdomain>
+Date: Wed Dec 3 17:22:07 2008 +1100
+
+ radeon: add support for accessing disabled ROMs.
+
+commit 7feff055f6dd69201505898686144566e461699b
+Author: Dave Airlie <airlied at ppcg5.localdomain>
+Date: Wed Dec 3 17:19:02 2008 +1100
+
+ radeon: make cail do pll read/write via actual PLL functions
+
+commit 51ccfff5621d1bc8fa5f9d29e623419611d9ebbf
+Author: Dave Airlie <airlied at ppcg5.localdomain>
+Date: Wed Dec 3 16:36:00 2008 +1100
+
+ radeon: atom fixes for endianness
+
+commit a56d542d3bc3e151abebeb64db70020efd7bf36b
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Dec 3 20:28:05 2008 +1000
+
+ radeon: AGP fixes round 2.
+
+ More I can't believe its not AGP fixes.
+ Limit the AGP aperture to the GART size, and init the registers
+ in the right place
+
+commit e651a3391488cb624ee8b257515e47cebdf90257
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Dec 2 12:49:17 2008 +1000
+
+ radeon: AGP fixes
+
+ 1. Proper PCIE fallback on PCIE cards.
+ 2. Setup agp base + location regs properly
+
+commit 3ceed970f283dab225effb8b417737ea4c10a423
+Author: Michal Schmidt <mschmidt at redhat.com>
+Date: Tue Dec 2 08:06:59 2008 +1000
+
+ radeon: fix IGP GART calcs
+
+ fedora bz 473895
+
+commit e6c5860714ad7602794893c052bf72fbf446ccf9
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Nov 27 17:14:40 2008 +1000
+
+ radeon: post any GPUs that aren't posted
+
+commit 8b6b8aa9a5f5ed6f8b93fedf8e02e8eca5893a3d
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Nov 24 15:18:31 2008 +1000
+
+ radeon: enable larger GART size on PCIE/IGP
+
+ Allocate a larger GART on PCIE and IGP chipsets controlled by the gart_size
+ command line option.
+
+ Default to 512MB gart.
+
+commit dd3c2dd42b25eca9e0a4ac9a2dc35492c2e1f8a9
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Nov 24 15:17:49 2008 +1000
+
+ radeon: add some missing feature checks for modesetting
+
+commit fd01f4996e6110403a4214b23f6a17a81401ed8e
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Nov 24 11:41:06 2008 +1100
+
+ radeon: make rs480/rs690 gart invalidate work properly.
+
+ we really need to read back to make sure the invalidate has happened
+ before continuing along happily in life.
+
+commit 0043eedf0bf9f51e1de33127e87ff23be4a69ccb
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Nov 23 19:19:02 2008 +1000
+
+ drm: we have discardable now so don't do special cases
+
+commit 65fbc52a61382d0ce9dd60414292f7596faa33ce
+Author: Dave Airlie <airlied at redhat.com>
[...2587 lines suppressed...]
@@ -33454,7 +35018,18 @@
radeon_cp_dispatch_swap(dev, file_priv->master);
sarea_priv->ctx_owner = 0;
-@@ -2872,7 +2882,7 @@ static int radeon_cp_cmdbuf(struct drm_device *dev, void *data, struct drm_file
+@@ -2603,8 +2609,8 @@ static int radeon_emit_packets(drm_radeon_private_t * dev_priv,
+ if (id >= RADEON_MAX_STATE_PACKETS)
+ return -EINVAL;
+
+- sz = packet[id].len;
+- reg = packet[id].start;
++ sz = radeon_packet[id].len;
++ reg = radeon_packet[id].start;
+
+ if (sz * sizeof(int) > cmdbuf->bufsz) {
+ DRM_ERROR("Packet size provided larger than data provided\n");
+@@ -2872,7 +2878,7 @@ static int radeon_cp_cmdbuf(struct drm_device *dev, void *data, struct drm_file
orig_nbox = cmdbuf->nbox;
@@ -33463,7 +35038,7 @@
int temp;
temp = r300_do_cp_cmdbuf(dev, file_priv, cmdbuf);
-@@ -3071,6 +3081,12 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3071,6 +3077,12 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
case RADEON_PARAM_NUM_GB_PIPES:
value = dev_priv->num_gb_pipes;
break;
@@ -33476,7 +35051,7 @@
default:
DRM_DEBUG("Invalid parameter %d\n", param->param);
return -EINVAL;
-@@ -3093,11 +3109,17 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3093,11 +3105,17 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
switch (sp->param) {
case RADEON_SETPARAM_FB_LOCATION:
@@ -33494,7 +35069,7 @@
if (sp->value == 0) {
DRM_DEBUG("color tiling disabled\n");
dev_priv->front_pitch_offset &= ~RADEON_DST_TILE_MACRO;
-@@ -3113,13 +3135,21 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3113,13 +3131,21 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
}
break;
case RADEON_SETPARAM_PCIGART_LOCATION:
@@ -33516,7 +35091,7 @@
dev_priv->gart_info.table_size = sp->value;
if (dev_priv->gart_info.table_size < RADEON_PCIGART_TABLE_SIZE)
dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
-@@ -3127,6 +3157,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3127,6 +3153,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
case RADEON_SETPARAM_VBLANK_CRTC:
return radeon_vblank_crtc_set(dev, sp->value);
break;
@@ -33531,7 +35106,7 @@
default:
DRM_DEBUG("Invalid parameter %d\n", sp->param);
return -EINVAL;
-@@ -3215,7 +3253,19 @@ struct drm_ioctl_desc radeon_ioctls[] = {
+@@ -3215,7 +3249,19 @@ struct drm_ioctl_desc radeon_ioctls[] = {
DRM_IOCTL_DEF(DRM_RADEON_IRQ_WAIT, radeon_irq_wait, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_SETPARAM, radeon_cp_setparam, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_SURF_ALLOC, radeon_surface_alloc, DRM_AUTH),
@@ -33553,7 +35128,7 @@
int radeon_max_ioctl = DRM_ARRAY_SIZE(radeon_ioctls);
diff --git a/include/drm/drm.h b/include/drm/drm.h
-index 32e5096..46389d5 100644
+index 8e77357..17a1e2c 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -174,6 +174,7 @@ enum drm_map_type {
@@ -33565,7 +35140,7 @@
/**
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index afb7858..01270cb 100644
+index e5f4ae9..c963f25 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -147,9 +147,23 @@ struct drm_device;
@@ -33592,7 +35167,7 @@
/*@}*/
-@@ -659,6 +673,8 @@ struct drm_master {
+@@ -652,6 +666,8 @@ struct drm_master {
void *driver_priv; /**< Private structure for driver to use */
};
@@ -33601,7 +35176,7 @@
/**
* DRM driver structure. This structure represent the common code for
* a family of cards. There will one drm_device for each card present
-@@ -777,6 +793,8 @@ struct drm_driver {
+@@ -770,6 +786,8 @@ struct drm_driver {
/* Driver private ops for this object */
struct vm_operations_struct *gem_vm_ops;
@@ -33610,7 +35185,7 @@
int major;
int minor;
-@@ -852,7 +870,10 @@ struct drm_device {
+@@ -845,7 +863,10 @@ struct drm_device {
/*@{ */
struct list_head maplist; /**< Linked list of regions */
int map_count; /**< Number of mappable regions */
@@ -33622,7 +35197,7 @@
/** \name Context handle management */
/*@{ */
-@@ -863,6 +884,7 @@ struct drm_device {
+@@ -856,6 +877,7 @@ struct drm_device {
struct idr ctx_idr;
struct list_head vmalist; /**< List of vmas (for debugging) */
@@ -33630,7 +35205,7 @@
/*@} */
-@@ -936,7 +958,6 @@ struct drm_device {
+@@ -927,7 +949,6 @@ struct drm_device {
int num_crtcs; /**< Number of CRTCs on this device */
void *dev_private; /**< device private data */
void *mm_private;
@@ -33638,7 +35213,7 @@
struct drm_sigdata sigdata; /**< For block_all_signals */
sigset_t sigmask;
-@@ -946,6 +967,9 @@ struct drm_device {
+@@ -937,6 +958,9 @@ struct drm_device {
struct drm_minor *control; /**< Control node for card */
struct drm_minor *primary; /**< render type primary screen head */
@@ -33648,7 +35223,7 @@
/** \name Drawable information */
/*@{ */
spinlock_t drw_lock;
-@@ -968,8 +992,28 @@ struct drm_device {
+@@ -959,8 +983,28 @@ struct drm_device {
uint32_t invalidate_domains; /* domains pending invalidation */
uint32_t flush_domains; /* domains pending flush */
/*@} */
@@ -33677,7 +35252,7 @@
static inline int drm_dev_to_irq(struct drm_device *dev)
{
-@@ -1079,6 +1123,17 @@ extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
+@@ -1070,6 +1114,17 @@ extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
uint32_t type);
extern int drm_unbind_agp(DRM_AGP_MEM * handle);
@@ -33695,7 +35270,7 @@
/* Misc. IOCTL support (drm_ioctl.h) */
extern int drm_irq_by_busid(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-@@ -1249,6 +1304,7 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size
+@@ -1240,6 +1295,7 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size
extern int drm_agp_free_memory(DRM_AGP_MEM * handle);
extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start);
extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle);
@@ -33703,7 +35278,7 @@
extern void drm_agp_chipset_flush(struct drm_device *dev);
/* Stub support (drm_stub.h) */
-@@ -1290,6 +1346,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev,
+@@ -1281,6 +1337,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev,
struct drm_ati_pcigart_info * gart_info);
extern int drm_ati_pcigart_cleanup(struct drm_device *dev,
struct drm_ati_pcigart_info * gart_info);
@@ -33712,7 +35287,7 @@
extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
size_t align, dma_addr_t maxaddr);
-@@ -1445,6 +1503,39 @@ extern void drm_free(void *pt, size_t size, int area);
+@@ -1438,6 +1496,39 @@ extern void drm_free(void *pt, size_t size, int area);
extern void *drm_calloc(size_t nmemb, size_t size, int area);
#endif
@@ -33753,7 +35328,7 @@
#endif /* __KERNEL__ */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index 0c6f0e1..e1f0f16 100644
+index 0b0d236..cb3952c 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -121,4 +121,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
@@ -34683,7 +36258,7 @@
+#endif
+#endif
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index b3bcf72..181d9de 100644
+index 912cd52..9aeb426 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -187,7 +187,7 @@ typedef struct _drm_i915_sarea {
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.3
retrieving revision 1.1294.2.4
diff -u -r1.1294.2.3 -r1.1294.2.4
--- kernel.spec 21 Feb 2009 16:05:57 -0000 1.1294.2.3
+++ kernel.spec 23 Feb 2009 20:07:04 -0000 1.1294.2.4
@@ -56,9 +56,9 @@
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 5
+%define rcrev 6
# The git snapshot level
-%define gitrev 4
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -96,13 +96,17 @@
# Build the kernel-doc package, but don't fail the build if it botches.
# Here "true" means "continue" and "false" means "fail the build".
-%define with_doc 0
%if 0%{?released_kernel}
%define doc_build_fail false
%else
%define doc_build_fail true
%endif
+%define rawhide_skip_docs 0
+%if 0%{?rawhide_skip_docs}
+%define with_doc 0
+%endif
+
# Additional options for user-friendly one-off kernel building:
#
# Only build the base kernel (--with baseonly):
@@ -637,14 +641,11 @@
Patch1550: linux-2.6-cdrom-door-status.patch
# nouveau + drm fixes
-Patch1811: drm-next.patch
Patch1812: drm-modesetting-radeon.patch
Patch1814: drm-nouveau.patch
Patch1815: drm-intel-next.patch
Patch1816: drm-no-gem-on-i8xx.patch
-Patch1817: drm-intel-suspend.patch
Patch1818: drm-i915-resume-force-mode.patch
-Patch1819: drm-modesetting-radeon-pciid.patch
# kludge to make ich9 e1000 work
Patch2000: linux-2.6-e1000-ich9.patch
@@ -1148,11 +1149,9 @@
#ApplyPatch drm-next.patch
ApplyPatch drm-modesetting-radeon.patch
ApplyPatch drm-nouveau.patch
-ApplyPatch drm-intel-next.patch
+#ApplyPatch drm-intel-next.patch
ApplyPatch drm-no-gem-on-i8xx.patch
-ApplyPatch drm-intel-suspend.patch
ApplyPatch drm-i915-resume-force-mode.patch
-ApplyPatch drm-modesetting-radeon-pciid.patch
# linux1394 git patches
ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1752,6 +1751,37 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Mon Feb 23 2009 Michael Young <m.a.young at durham.ac.uk>
+- update pvops patch
+- unset CONFIG_CC_STACKPROTECTOR (conflicts with xen_start_kernel)
+- unset CONFIG_PCI_MSI (dom0 pvops doesn't support it) and
+ dependent CONFIG_AMD_IOMMU
+
+* Mon Feb 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.145.rc6
+- Linux 2.6.29-rc6
+- drm-intel-suspend.patch: drop, merged upstream
+- selinux-netlabel_setsockopt_fix.patch: drop, merged upstream
+
+* Mon Feb 23 2009 Kyle McMartin <kyle at redhat.com>
+- regexp-ing up with_doc turns out to be fail. define a new var
+ rawhide_skip_docs to 1 when we don't want to build them. tested with
+ upcoming patch-2.6.29-rc6.bz2...
+
+* Mon Feb 23 2009 Kyle McMartin <kyle at redhat.com>
+- Build docs once per -rc rebase and when 'make release.'
+
+* Sun Feb 22 2009 Kyle McMartin <kyle at redhat.com>
+- Add patch from Paul Moore to fix setsockopt when netlabel is in use (ie:
+ when selinux is enabled.) resolves bz#486225.
+
+* Sun Feb 22 2009 Dave Airlie <airlied at redhat.com> 2.6.29-0.140.rc5.git5
+- rebase drm bits
+- temp disable drm-intel-next need krh to rebase - bump gitrev to 5
+
+* Sat Feb 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.139.rc5.git5
+- 2.6.29-rc5-git5
+- Temporarily disable drm-modesetting-radeon.
+
* Sat Feb 21 2009 Michael Young <m.a.young at durham.ac.uk>
- Update pvops patch
@@ -1767,7 +1797,7 @@
* Thu Feb 19 2009 Michael Young <m.a.young at durham.ac.uk>
- Update pvops patch which includes the fix for major apic bug
-- http://lists.xensource.com/archives/html/xen-devel/2009-02/msg00769.html
+ http://lists.xensource.com/archives/html/xen-devel/2009-02/msg00769.html
* Thu Feb 19 2009 Dave Jones <davej at redhat.com> 2.6.29-0.131.rc5.git3
- 2.6.29-rc5-git3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.3
retrieving revision 1.976.2.4
diff -u -r1.976.2.3 -r1.976.2.4
--- sources 21 Feb 2009 16:06:00 -0000 1.976.2.3
+++ sources 23 Feb 2009 20:07:05 -0000 1.976.2.4
@@ -1,3 +1,2 @@
d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2
-60193569887cb6fe98b9c0d483f911e7 patch-2.6.29-rc5.bz2
-84bdb00a4c73ecd832ea8e6d443ad547 patch-2.6.29-rc5-git4.bz2
+26f67d99666834cc579094619821d3c8 patch-2.6.29-rc6.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.2
retrieving revision 1.888.2.3
diff -u -r1.888.2.2 -r1.888.2.3
--- upstream 21 Feb 2009 16:06:01 -0000 1.888.2.2
+++ upstream 23 Feb 2009 20:07:05 -0000 1.888.2.3
@@ -1,3 +1,2 @@
linux-2.6.28.tar.bz2
-patch-2.6.29-rc5.bz2
-patch-2.6.29-rc5-git4.bz2
+patch-2.6.29-rc6.bz2
xen.pvops.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1.2.3 -r 1.1.2.4 xen.pvops.patch
Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- xen.pvops.patch 21 Feb 2009 16:06:02 -0000 1.1.2.3
+++ xen.pvops.patch 23 Feb 2009 20:07:05 -0000 1.1.2.4
@@ -1,15 +1,3 @@
-diff --git a/CREDITS b/CREDITS
-index 5e07367..2b39168 100644
---- a/CREDITS
-+++ b/CREDITS
-@@ -2166,6 +2166,7 @@ D: Initial implementation of VC's, pty's and select()
-
- N: Pavel Machek
- E: pavel at ucw.cz
-+E: pavel at suse.cz
- D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd
- D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
- D: work on suspend-to-ram/disk, killing duplicates from ioctl32
diff --git a/Documentation/ABI/testing/debugfs-kmemtrace b/Documentation/ABI/testing/debugfs-kmemtrace
new file mode 100644
index 0000000..5e6a92a
@@ -87,35 +75,6 @@
+Users:
+ kmemtrace-user - git://repo.or.cz/kmemtrace-user.git
+
-diff --git a/Documentation/ABI/testing/sysfs-firmware-memmap b/Documentation/ABI/testing/sysfs-firmware-memmap
-index eca0d65..0d99ee6 100644
---- a/Documentation/ABI/testing/sysfs-firmware-memmap
-+++ b/Documentation/ABI/testing/sysfs-firmware-memmap
-@@ -1,6 +1,6 @@
- What: /sys/firmware/memmap/
- Date: June 2008
--Contact: Bernhard Walle <bernhard.walle at gmx.de>
-+Contact: Bernhard Walle <bwalle at suse.de>
- Description:
- On all platforms, the firmware provides a memory map which the
- kernel reads. The resources from that memory map are registered
-diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
-index 93feb84..d9e5d6f 100644
---- a/Documentation/cgroups/cgroups.txt
-+++ b/Documentation/cgroups/cgroups.txt
-@@ -252,8 +252,10 @@ cgroup file system directories.
- When a task is moved from one cgroup to another, it gets a new
- css_set pointer - if there's an already existing css_set with the
- desired collection of cgroups then that group is reused, else a new
--css_set is allocated. The appropriate existing css_set is located by
--looking into a hash table.
-+css_set is allocated. Note that the current implementation uses a
-+linear search to locate an appropriate existing css_set, so isn't
-+very efficient. A future version will use a hash table for better
-+performance.
-
- To allow access from a cgroup to the css_sets (and hence tasks)
- that comprise it, a set of cg_cgroup_link objects form a lattice;
diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt
index 45932ec..b41f3e5 100644
--- a/Documentation/cputopology.txt
@@ -136,19 +95,993 @@
To be consistent on all architectures, include/linux/topology.h
provides default definitions for any of the above macros that are
diff --git a/Documentation/ftrace.txt b/Documentation/ftrace.txt
-index 803b131..758fb42 100644
+index 803b131..2041ee9 100644
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
-@@ -165,6 +165,8 @@ Here is the list of current tracers that may be configured.
- nop - This is not a tracer. To remove all tracers from tracing
- simply echo "nop" into current_tracer.
+@@ -15,31 +15,31 @@ Introduction
+
+ Ftrace is an internal tracer designed to help out developers and
+ designers of systems to find what is going on inside the kernel.
+-It can be used for debugging or analyzing latencies and performance
+-issues that take place outside of user-space.
++It can be used for debugging or analyzing latencies and
++performance issues that take place outside of user-space.
+
+ Although ftrace is the function tracer, it also includes an
+-infrastructure that allows for other types of tracing. Some of the
+-tracers that are currently in ftrace include a tracer to trace
+-context switches, the time it takes for a high priority task to
+-run after it was woken up, the time interrupts are disabled, and
+-more (ftrace allows for tracer plugins, which means that the list of
+-tracers can always grow).
++infrastructure that allows for other types of tracing. Some of
++the tracers that are currently in ftrace include a tracer to
++trace context switches, the time it takes for a high priority
++task to run after it was woken up, the time interrupts are
++disabled, and more (ftrace allows for tracer plugins, which
++means that the list of tracers can always grow).
+
+
+ The File System
+ ---------------
+
+-Ftrace uses the debugfs file system to hold the control files as well
+-as the files to display output.
++Ftrace uses the debugfs file system to hold the control files as
++well as the files to display output.
+
+ To mount the debugfs system:
+
+ # mkdir /debug
+ # mount -t debugfs nodev /debug
+
+-(Note: it is more common to mount at /sys/kernel/debug, but for simplicity
+- this document will use /debug)
++( Note: it is more common to mount at /sys/kernel/debug, but for
++ simplicity this document will use /debug)
+
+ That's it! (assuming that you have ftrace configured into your kernel)
+
+@@ -50,90 +50,124 @@ of ftrace. Here is a list of some of the key files:
+
+ Note: all time values are in microseconds.
+
+- current_tracer: This is used to set or display the current tracer
+- that is configured.
+-
+- available_tracers: This holds the different types of tracers that
+- have been compiled into the kernel. The tracers
+- listed here can be configured by echoing their name
+- into current_tracer.
+-
+- tracing_enabled: This sets or displays whether the current_tracer
+- is activated and tracing or not. Echo 0 into this
+- file to disable the tracer or 1 to enable it.
+-
+- trace: This file holds the output of the trace in a human readable
+- format (described below).
+-
+- latency_trace: This file shows the same trace but the information
+- is organized more to display possible latencies
+- in the system (described below).
+-
+- trace_pipe: The output is the same as the "trace" file but this
+- file is meant to be streamed with live tracing.
+- Reads from this file will block until new data
+- is retrieved. Unlike the "trace" and "latency_trace"
+- files, this file is a consumer. This means reading
+- from this file causes sequential reads to display
+- more current data. Once data is read from this
+- file, it is consumed, and will not be read
+- again with a sequential read. The "trace" and
+- "latency_trace" files are static, and if the
+- tracer is not adding more data, they will display
+- the same information every time they are read.
+-
+- trace_options: This file lets the user control the amount of data
+- that is displayed in one of the above output
+- files.
+-
+- trace_max_latency: Some of the tracers record the max latency.
+- For example, the time interrupts are disabled.
+- This time is saved in this file. The max trace
+- will also be stored, and displayed by either
+- "trace" or "latency_trace". A new max trace will
+- only be recorded if the latency is greater than
+- the value in this file. (in microseconds)
+-
+- buffer_size_kb: This sets or displays the number of kilobytes each CPU
+- buffer can hold. The tracer buffers are the same size
+- for each CPU. The displayed number is the size of the
+- CPU buffer and not total size of all buffers. The
+- trace buffers are allocated in pages (blocks of memory
+- that the kernel uses for allocation, usually 4 KB in size).
+- If the last page allocated has room for more bytes
+- than requested, the rest of the page will be used,
+- making the actual allocation bigger than requested.
+- (Note, the size may not be a multiple of the page size due
+- to buffer managment overhead.)
+-
+- This can only be updated when the current_tracer
+- is set to "nop".
+-
+- tracing_cpumask: This is a mask that lets the user only trace
+- on specified CPUS. The format is a hex string
+- representing the CPUS.
+-
+- set_ftrace_filter: When dynamic ftrace is configured in (see the
+- section below "dynamic ftrace"), the code is dynamically
+- modified (code text rewrite) to disable calling of the
+- function profiler (mcount). This lets tracing be configured
+- in with practically no overhead in performance. This also
+- has a side effect of enabling or disabling specific functions
+- to be traced. Echoing names of functions into this file
+- will limit the trace to only those functions.
+-
+- set_ftrace_notrace: This has an effect opposite to that of
+- set_ftrace_filter. Any function that is added here will not
+- be traced. If a function exists in both set_ftrace_filter
+- and set_ftrace_notrace, the function will _not_ be traced.
+-
+- set_ftrace_pid: Have the function tracer only trace a single thread.
+-
+- available_filter_functions: This lists the functions that ftrace
+- has processed and can trace. These are the function
[...11618 lines suppressed...]
-+++ b/mm/vmalloc.c
-@@ -1106,14 +1106,6 @@ struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
- }
- EXPORT_SYMBOL_GPL(__get_vm_area);
-
--struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags,
-- unsigned long start, unsigned long end,
-- void *caller)
--{
-- return __get_vm_area_node(size, flags, start, end, -1, GFP_KERNEL,
-- caller);
--}
--
- /**
- * get_vm_area - reserve a contiguous kernel virtual area
- * @size: size of the area
diff --git a/mm/vmscan.c b/mm/vmscan.c
-index 9a27c44..cf84413 100644
+index 6177e3b..ae6f4c1 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1965,6 +1965,8 @@ static int kswapd(void *p)
@@ -102291,19 +103057,6 @@
}
list_for_each_entry_rcu(node, &sel_netnode_hash[idx].list, list)
-diff --git a/sound/core/jack.c b/sound/core/jack.c
-index 077a852..dd4a12d 100644
---- a/sound/core/jack.c
-+++ b/sound/core/jack.c
-@@ -47,7 +47,7 @@ static int snd_jack_dev_register(struct snd_device *device)
- int err;
-
- snprintf(jack->name, sizeof(jack->name), "%s %s",
-- card->shortname, jack->id);
-+ card->longname, jack->id);
- jack->input_dev->name = jack->name;
-
- /* Default to the sound card device. */
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 0bcf146..491e0d7 100644
--- a/sound/drivers/Kconfig
@@ -102352,93 +103105,6 @@
static struct pnp_dev *activate_dev(char *devname, char *resname, struct pnp_dev *dev)
{
-diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index c8d9178..11e791b 100644
---- a/sound/pci/hda/hda_intel.c
-+++ b/sound/pci/hda/hda_intel.c
-@@ -1947,13 +1947,16 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
- return 0;
- }
-
-+static int azx_resume_early(struct pci_dev *pci)
-+{
-+ return pci_restore_state(pci);
-+}
-+
- static int azx_resume(struct pci_dev *pci)
- {
- struct snd_card *card = pci_get_drvdata(pci);
- struct azx *chip = card->private_data;
-
-- pci_set_power_state(pci, PCI_D0);
-- pci_restore_state(pci);
- if (pci_enable_device(pci) < 0) {
- printk(KERN_ERR "hda-intel: pci_enable_device failed, "
- "disabling device\n");
-@@ -2465,6 +2468,7 @@ static struct pci_driver driver = {
- .remove = __devexit_p(azx_remove),
- #ifdef CONFIG_PM
- .suspend = azx_suspend,
-+ .resume_early = azx_resume_early,
- .resume = azx_resume,
- #endif
- };
-diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
-index 6c870c1..18c7c91 100644
---- a/sound/pci/oxygen/virtuoso.c
-+++ b/sound/pci/oxygen/virtuoso.c
-@@ -26,7 +26,7 @@
- * SPI 0 -> 1st PCM1796 (front)
- * SPI 1 -> 2nd PCM1796 (surround)
- * SPI 2 -> 3rd PCM1796 (center/LFE)
-- * SPI 4 -> 4th PCM1796 (back)
-+ * SPI 4 -> 4th PCM1796 (back) and EEPROM self-destruct (do not use!)
- *
- * GPIO 2 -> M0 of CS5381
- * GPIO 3 -> M1 of CS5381
-@@ -207,6 +207,12 @@ static void xonar_gpio_changed(struct oxygen *chip);
- static inline void pcm1796_write_spi(struct oxygen *chip, unsigned int codec,
- u8 reg, u8 value)
- {
-+ /*
-+ * We don't want to do writes on SPI 4 because the EEPROM, which shares
-+ * the same pin, might get confused and broken. We'd better take care
-+ * that the driver works with the default register values ...
-+ */
-+#if 0
- /* maps ALSA channel pair number to SPI output */
- static const u8 codec_map[4] = {
- 0, 1, 2, 4
-@@ -217,6 +223,7 @@ static inline void pcm1796_write_spi(struct oxygen *chip, unsigned int codec,
- (codec_map[codec] << OXYGEN_SPI_CODEC_SHIFT) |
- OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
- (reg << 8) | value);
-+#endif
- }
-
- static inline void pcm1796_write_i2c(struct oxygen *chip, unsigned int codec,
-@@ -750,6 +757,9 @@ static const DECLARE_TLV_DB_SCALE(cs4362a_db_scale, -12700, 100, 0);
-
- static int xonar_d2_control_filter(struct snd_kcontrol_new *template)
- {
-+ if (!strncmp(template->name, "Master Playback ", 16))
-+ /* disable volume/mute because they would require SPI writes */
-+ return 1;
- if (!strncmp(template->name, "CD Capture ", 11))
- /* CD in is actually connected to the video in pin */
- template->private_value ^= AC97_CD ^ AC97_VIDEO;
-@@ -840,9 +850,8 @@ static const struct oxygen_model model_xonar_d2 = {
- .dac_volume_min = 0x0f,
- .dac_volume_max = 0xff,
- .misc_flags = OXYGEN_MISC_MIDI,
-- .function_flags = OXYGEN_FUNCTION_SPI |
-- OXYGEN_FUNCTION_ENABLE_SPI_4_5,
-- .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-+ .function_flags = OXYGEN_FUNCTION_SPI,
-+ .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
- .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
- };
-
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 27cf2c2..5d3ed63 100644
--- a/sound/pci/pcxhr/pcxhr.c
@@ -102529,63 +103195,3 @@
int err;
if (dev >= SNDRV_CARDS)
-diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
-index 19e3745..2ab8312 100644
---- a/sound/usb/usbaudio.c
-+++ b/sound/usb/usbaudio.c
-@@ -2524,6 +2524,7 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
- * build the rate table and bitmap flags
- */
- int r, idx;
-+ unsigned int nonzero_rates = 0;
-
- fp->rate_table = kmalloc(sizeof(int) * nr_rates, GFP_KERNEL);
- if (fp->rate_table == NULL) {
-@@ -2531,27 +2532,24 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
- return -1;
- }
-
-- fp->nr_rates = 0;
-- fp->rate_min = fp->rate_max = 0;
-+ fp->nr_rates = nr_rates;
-+ fp->rate_min = fp->rate_max = combine_triple(&fmt[8]);
- for (r = 0, idx = offset + 1; r < nr_rates; r++, idx += 3) {
- unsigned int rate = combine_triple(&fmt[idx]);
-- if (!rate)
-- continue;
- /* C-Media CM6501 mislabels its 96 kHz altsetting */
- if (rate == 48000 && nr_rates == 1 &&
-- (chip->usb_id == USB_ID(0x0d8c, 0x0201) ||
-- chip->usb_id == USB_ID(0x0d8c, 0x0102)) &&
-+ chip->usb_id == USB_ID(0x0d8c, 0x0201) &&
- fp->altsetting == 5 && fp->maxpacksize == 392)
- rate = 96000;
-- fp->rate_table[fp->nr_rates] = rate;
-- if (!fp->rate_min || rate < fp->rate_min)
-+ fp->rate_table[r] = rate;
-+ nonzero_rates |= rate;
-+ if (rate < fp->rate_min)
- fp->rate_min = rate;
-- if (!fp->rate_max || rate > fp->rate_max)
-+ else if (rate > fp->rate_max)
- fp->rate_max = rate;
- fp->rates |= snd_pcm_rate_to_rate_bit(rate);
-- fp->nr_rates++;
- }
-- if (!fp->nr_rates) {
-+ if (!nonzero_rates) {
- hwc_debug("All rates were zero. Skipping format!\n");
- return -1;
- }
-diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
-index 26bad37..320641a 100644
---- a/sound/usb/usbmidi.c
-+++ b/sound/usb/usbmidi.c
-@@ -1625,7 +1625,6 @@ static int snd_usbmidi_create_endpoints_midiman(struct snd_usb_midi* umidi,
- }
-
- ep_info.out_ep = get_endpoint(hostif, 2)->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
-- ep_info.out_interval = 0;
- ep_info.out_cables = endpoint->out_cables & 0x5555;
- err = snd_usbmidi_out_endpoint_create(umidi, &ep_info, &umidi->endpoints[0]);
- if (err < 0)
--- drm-intel-suspend.patch DELETED ---
--- drm-modesetting-radeon-pciid.patch DELETED ---
--- drm-next.patch DELETED ---
--- patch-2.6.29-rc5-git4.bz2.sign DELETED ---
--- patch-2.6.29-rc5.bz2.sign DELETED ---
More information about the fedora-extras-commits
mailing list