rpms/kernel/devel patch-2.6.16-rc2.bz2.sign, NONE, 1.1 .cvsignore, 1.335, 1.336 drm.patch, 1.1, 1.2 kernel-2.6.spec, 1.1898, 1.1899 linux-2.6-debug-singlebiterror.patch, 1.5, 1.6 sources, 1.277, 1.278 upstream, 1.252, 1.253
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 3 16:35:08 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19525
Modified Files:
.cvsignore drm.patch kernel-2.6.spec
linux-2.6-debug-singlebiterror.patch sources upstream
Added Files:
patch-2.6.16-rc2.bz2.sign
Log Message:
rc2
--- NEW FILE patch-2.6.16-rc2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBD4vu4yGugalF9Dw4RAj/kAJ97++ivhc2RkFmeAvATGmP1vDApYwCaAumq
CYzywIPTcbHSKwTCXrxekX0=
=ppHJ
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- .cvsignore 2 Feb 2006 21:20:36 -0000 1.335
+++ .cvsignore 3 Feb 2006 16:34:55 -0000 1.336
@@ -2,8 +2,6 @@
temp-*
kernel-2.6.15
linux-2.6.15.tar.bz2
-patch-2.6.16-rc1.bz2
bcm43xx-20060114.tar.bz2
-acpi-release-20060113-2.6.16-rc1.diff.bz2
-patch-2.6.16-rc1-git5.bz2
+patch-2.6.16-rc2.bz2
patch-2.6.16-rc1-git6.bz2
drm.patch:
b/drivers/char/drm/Makefile | 4
b/drivers/char/drm/ati_pcigart.c | 40 -
b/drivers/char/drm/drm.h | 4
b/drivers/char/drm/drmP.h | 127 +++--
b/drivers/char/drm/drm_agpsupport.c | 133 +++--
b/drivers/char/drm/drm_auth.c | 20
b/drivers/char/drm/drm_bufs.c | 129 +++--
b/drivers/char/drm/drm_context.c | 54 +-
b/drivers/char/drm/drm_core.h | 4
b/drivers/char/drm/drm_drv.c | 156 +++---
b/drivers/char/drm/drm_fops.c | 325 +++++++------
b/drivers/char/drm/drm_ioc32.c | 1
b/drivers/char/drm/drm_ioctl.c | 45 -
b/drivers/char/drm/drm_irq.c | 16
b/drivers/char/drm/drm_lock.c | 1
b/drivers/char/drm/drm_memory.c | 8
b/drivers/char/drm/drm_memory_debug.h | 269 +++++------
b/drivers/char/drm/drm_os_linux.h | 1
b/drivers/char/drm/drm_pciids.h | 14
b/drivers/char/drm/drm_proc.c | 44 -
b/drivers/char/drm/drm_stub.c | 67 --
b/drivers/char/drm/drm_sysfs.c | 66 +-
b/drivers/char/drm/drm_vm.c | 12
b/drivers/char/drm/i810_dma.c | 51 +-
b/drivers/char/drm/i810_drv.c | 60 --
b/drivers/char/drm/i810_drv.h | 12
b/drivers/char/drm/i830_dma.c | 49 +-
b/drivers/char/drm/i830_drv.c | 59 --
b/drivers/char/drm/i830_drv.h | 11
b/drivers/char/drm/i915_dma.c | 92 ++-
b/drivers/char/drm/i915_drm.h | 39 +
b/drivers/char/drm/i915_drv.c | 66 --
b/drivers/char/drm/i915_drv.h | 46 +
b/drivers/char/drm/i915_ioc32.c | 1
b/drivers/char/drm/i915_irq.c | 48 +-
b/drivers/char/drm/i915_mem.c | 36 +
b/drivers/char/drm/mga_dma.c | 160 ++++--
b/drivers/char/drm/mga_drv.c | 58 --
b/drivers/char/drm/mga_drv.h | 14
b/drivers/char/drm/mga_ioc32.c | 1
b/drivers/char/drm/mga_state.c | 26 -
b/drivers/char/drm/r128_cce.c | 15
b/drivers/char/drm/r128_drm.h | 4
b/drivers/char/drm/r128_drv.c | 48 --
b/drivers/char/drm/r128_drv.h | 8
b/drivers/char/drm/r128_ioc32.c | 1
b/drivers/char/drm/r128_irq.c | 4
b/drivers/char/drm/r128_state.c | 44 -
b/drivers/char/drm/r300_cmdbuf.c | 38 -
b/drivers/char/drm/r300_reg.h | 1
b/drivers/char/drm/radeon_cp.c | 108 ++--
b/drivers/char/drm/radeon_drm.h | 6
b/drivers/char/drm/radeon_drv.c | 62 +-
b/drivers/char/drm/radeon_drv.h | 41 -
b/drivers/char/drm/radeon_ioc32.c | 1
b/drivers/char/drm/radeon_state.c | 246 ++++------
b/drivers/char/drm/savage_bci.c | 85 ++-
b/drivers/char/drm/savage_drv.c | 50 --
b/drivers/char/drm/savage_drv.h | 30 -
b/drivers/char/drm/savage_state.c | 324 ++++++-------
b/drivers/char/drm/sis_drm.h | 25 +
b/drivers/char/drm/sis_drv.c | 42 -
b/drivers/char/drm/sis_drv.h | 4
b/drivers/char/drm/sis_ds.h | 7
b/drivers/char/drm/sis_mm.c | 30 -
b/drivers/char/drm/tdfx_drv.c | 42 -
b/drivers/char/drm/tdfx_drv.h | 7
b/drivers/char/drm/via_dma.c | 48 +-
b/drivers/char/drm/via_dmablit.c | 805 ++++++++++++++++++++++++++++++++++
b/drivers/char/drm/via_dmablit.h | 140 +++++
b/drivers/char/drm/via_drm.h | 58 +-
b/drivers/char/drm/via_drv.c | 63 --
b/drivers/char/drm/via_drv.h | 49 +-
b/drivers/char/drm/via_ds.c | 9
b/drivers/char/drm/via_irq.c | 51 +-
b/drivers/char/drm/via_map.c | 47 +
b/drivers/char/drm/via_mm.c | 20
b/drivers/char/drm/via_verifier.c | 6
b/drivers/char/drm/via_verifier.h | 4
b/drivers/char/drm/via_video.c | 7
drivers/char/drm/drm_init.c | 53 --
81 files changed, 3026 insertions(+), 1976 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 drm.patch
Index: drm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/drm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drm.patch 16 Jan 2006 04:30:01 -0000 1.1
+++ drm.patch 3 Feb 2006 16:34:55 -0000 1.2
@@ -21,10 +21,10 @@
ifeq ($(CONFIG_COMPAT),y)
drm-objs += drm_ioc32.o
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
-index efff0ee..5485382 100644
+index efff0ee..bd7be09 100644
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
-@@ -52,7 +52,7 @@
+@@ -52,47 +52,43 @@
# define ATI_MAX_PCIGART_PAGES 8192 /**< 32 MB aperture, 4K pages */
# define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */
@@ -33,9 +33,25 @@
{
unsigned long address;
struct page *page;
-@@ -72,27 +72,26 @@ static unsigned long drm_ati_alloc_pciga
+ int i;
+ DRM_DEBUG("%s\n", __FUNCTION__);
+
+- address = __get_free_pages(GFP_KERNEL, ATI_PCIGART_TABLE_ORDER);
++ address = __get_free_pages(GFP_KERNEL | __GFP_COMP,
++ ATI_PCIGART_TABLE_ORDER);
+ if (address == 0UL) {
+- return 0;
++ return NULL;
}
+ page = virt_to_page(address);
+
+- for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
+- get_page(page);
++ for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++)
+ SetPageReserved(page);
+- }
+
DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address);
- return address;
+ return (void *)address;
@@ -51,10 +67,11 @@
- page = virt_to_page(address);
+ page = virt_to_page((unsigned long)address);
- for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
- __put_page(page);
+- for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
+- __put_page(page);
++ for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++)
ClearPageReserved(page);
- }
+- }
- free_pages(address, ATI_PCIGART_TABLE_ORDER);
+ free_pages((unsigned long)address, ATI_PCIGART_TABLE_ORDER);
@@ -66,7 +83,16 @@
{
drm_sg_mem_t *entry = dev->sg;
unsigned long pages;
-@@ -136,10 +135,10 @@ int drm_ati_pcigart_cleanup(drm_device_t
+@@ -128,7 +124,7 @@ int drm_ati_pcigart_cleanup(drm_device_t
+ if (gart_info->gart_table_location == DRM_ATI_GART_MAIN
+ && gart_info->addr) {
+ drm_ati_free_pcigart_table(gart_info->addr);
+- gart_info->addr = 0;
++ gart_info->addr = NULL;
+ }
+
+ return 1;
+@@ -136,10 +132,10 @@ int drm_ati_pcigart_cleanup(drm_device_t
EXPORT_SYMBOL(drm_ati_pcigart_cleanup);
@@ -79,7 +105,7 @@
unsigned long pages;
u32 *pci_gart, page_base, bus_address = 0;
int i, j, ret = 0;
-@@ -163,7 +162,7 @@ int drm_ati_pcigart_init(drm_device_t *
+@@ -163,20 +159,20 @@ int drm_ati_pcigart_init(drm_device_t *
goto done;
}
@@ -88,7 +114,13 @@
ATI_PCIGART_TABLE_PAGES *
PAGE_SIZE, PCI_DMA_TODEVICE);
if (bus_address == 0) {
-@@ -176,7 +175,7 @@ int drm_ati_pcigart_init(drm_device_t *
+ DRM_ERROR("unable to map PCIGART pages!\n");
+ drm_ati_free_pcigart_table(address);
+- address = 0;
++ address = NULL;
+ goto done;
+ }
+ } else {
address = gart_info->addr;
bus_address = gart_info->bus_addr;
DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n",
@@ -97,7 +129,7 @@
}
pci_gart = (u32 *) address;
-@@ -195,7 +194,7 @@ int drm_ati_pcigart_init(drm_device_t *
+@@ -195,7 +191,7 @@ int drm_ati_pcigart_init(drm_device_t *
if (entry->busaddr[i] == 0) {
DRM_ERROR("unable to map PCIGART pages!\n");
drm_ati_pcigart_cleanup(dev, gart_info);
@@ -122,10 +154,18 @@
#define _DRM_LOCK_IS_CONT(lock) ((lock) & _DRM_LOCK_CONT)
#define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
-index 3dc3c9d..54b561e 100644
+index 3dc3c9d..71b8b32 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
-@@ -144,20 +144,6 @@
+@@ -57,6 +57,7 @@
+ #include <linux/smp_lock.h> /* For (un)lock_kernel */
+ #include <linux/mm.h>
+ #include <linux/cdev.h>
++#include <linux/mutex.h>
+ #if defined(__alpha__) || defined(__powerpc__)
+ #include <asm/pgtable.h> /* For pte_wrprotect */
+ #endif
+@@ -144,20 +145,6 @@
/** \name Backward compatibility section */
/*@{*/
@@ -146,7 +186,7 @@
#define DRM_RPR_ARG(vma) vma,
#define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
-@@ -286,10 +272,13 @@ typedef int drm_ioctl_t(struct inode *in
+@@ -286,10 +273,13 @@ typedef int drm_ioctl_t(struct inode *in
typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
unsigned long arg);
@@ -162,7 +202,7 @@
} drm_ioctl_desc_t;
typedef struct drm_devstate {
-@@ -384,6 +373,7 @@ typedef struct drm_buf_entry {
+@@ -384,6 +374,7 @@ typedef struct drm_buf_entry {
/** File private data */
typedef struct drm_file {
int authenticated;
@@ -170,7 +210,7 @@
int minor;
pid_t pid;
uid_t uid;
-@@ -532,8 +522,9 @@ typedef struct drm_vbl_sig {
+@@ -532,8 +523,9 @@ typedef struct drm_vbl_sig {
typedef struct ati_pcigart_info {
int gart_table_location;
int is_pcie;
@@ -181,7 +221,7 @@
} drm_ati_pcigart_info;
/**
-@@ -544,16 +535,14 @@ typedef struct ati_pcigart_info {
+@@ -544,16 +536,14 @@ typedef struct ati_pcigart_info {
struct drm_device;
struct drm_driver {
@@ -205,7 +245,7 @@
void (*dma_ready) (struct drm_device *);
int (*dma_quiescent) (struct drm_device *);
int (*context_ctor) (struct drm_device * dev, int context);
-@@ -561,8 +550,9 @@ struct drm_driver {
+@@ -561,8 +551,9 @@ struct drm_driver {
int (*kernel_context_switch) (struct drm_device * dev, int old,
int new);
void (*kernel_context_switch_unlock) (struct drm_device * dev,
@@ -216,7 +256,7 @@
/**
* Called by \c drm_device_is_agp. Typically used to determine if a
-@@ -579,16 +569,24 @@ struct drm_driver {
+@@ -579,16 +570,24 @@ struct drm_driver {
/* these have to be filled in */
@@ -244,7 +284,25 @@
u32 driver_features;
int dev_priv_size;
drm_ioctl_desc_t *ioctls;
-@@ -752,19 +750,43 @@ static inline int drm_core_has_MTRR(stru
+@@ -625,7 +624,7 @@ typedef struct drm_device {
+ /** \name Locks */
+ /*@{ */
+ spinlock_t count_lock; /**< For inuse, drm_device::open_count, drm_device::buf_use */
+- struct semaphore struct_sem; /**< For others */
++ struct mutex struct_mutex; /**< For others */
[...1905 lines suppressed...]
@@ -5808,7 +7014,7 @@
/*
* command DMA support
*/
-@@ -534,8 +527,8 @@ extern void savage_emit_clip_rect_s4(drm
+@@ -534,8 +526,8 @@ extern void savage_emit_clip_rect_s4(drm
#define DMA_WRITE( val ) *dma_ptr++ = (uint32_t)(val)
@@ -6806,10 +8012,10 @@
*/
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c
-index d4b1766..593c0b8 100644
+index d4b1766..a691ae7 100644
--- a/drivers/char/drm/via_dma.c
+++ b/drivers/char/drm/via_dma.c
-@@ -213,7 +213,9 @@ static int via_initialize(drm_device_t *
+@@ -213,14 +213,16 @@ static int via_initialize(drm_device_t *
dev_priv->dma_wrap = init->size;
dev_priv->dma_offset = init->offset;
dev_priv->last_pause_ptr = NULL;
@@ -6820,6 +8026,14 @@
via_cmdbuf_start(dev_priv);
+ return 0;
+ }
+
+-int via_dma_init(DRM_IOCTL_ARGS)
++static int via_dma_init(DRM_IOCTL_ARGS)
+ {
+ DRM_DEVICE;
+ drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
@@ -232,13 +234,13 @@ int via_dma_init(DRM_IOCTL_ARGS)
switch (init.func) {
@@ -6836,6 +8050,24 @@
retcode = DRM_ERR(EPERM);
else
retcode = via_dma_cleanup(dev);
+@@ -319,7 +321,7 @@ int via_driver_dma_quiescent(drm_device_
+ return 0;
+ }
+
+-int via_flush_ioctl(DRM_IOCTL_ARGS)
++static int via_flush_ioctl(DRM_IOCTL_ARGS)
+ {
+ DRM_DEVICE;
+
+@@ -328,7 +330,7 @@ int via_flush_ioctl(DRM_IOCTL_ARGS)
+ return via_driver_dma_quiescent(dev);
+ }
+
+-int via_cmdbuffer(DRM_IOCTL_ARGS)
++static int via_cmdbuffer(DRM_IOCTL_ARGS)
+ {
+ DRM_DEVICE;
+ drm_via_cmdbuffer_t cmdbuf;
@@ -349,9 +351,6 @@ int via_cmdbuffer(DRM_IOCTL_ARGS)
return 0;
}
@@ -6846,6 +8078,15 @@
static int via_dispatch_pci_cmdbuffer(drm_device_t * dev,
drm_via_cmdbuffer_t * cmd)
{
+@@ -376,7 +375,7 @@ static int via_dispatch_pci_cmdbuffer(dr
+ return ret;
+ }
+
+-int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
++static int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
+ {
+ DRM_DEVICE;
+ drm_via_cmdbuffer_t cmdbuf;
@@ -450,9 +449,9 @@ static int via_hook_segment(drm_via_priv
if ((count <= 8) && (count >= 0)) {
uint32_t rgtr, ptr;
@@ -6868,6 +8109,15 @@
dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr + 4;
ptr_low = (ptr > 3 * CMDBUF_ALIGNMENT_SIZE) ?
+@@ -666,7 +665,7 @@ static void via_cmdbuf_reset(drm_via_pri
+ * User interface to the space and lag functions.
+ */
+
+-int via_cmdbuf_size(DRM_IOCTL_ARGS)
++static int via_cmdbuf_size(DRM_IOCTL_ARGS)
+ {
+ DRM_DEVICE;
+ drm_via_cmdbuf_size_t d_siz;
@@ -724,3 +723,22 @@ int via_cmdbuf_size(DRM_IOCTL_ARGS)
sizeof(d_siz));
return ret;
@@ -6893,7 +8143,7 @@
+int via_max_ioctl = DRM_ARRAY_SIZE(via_ioctls);
diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c
new file mode 100644
-index 0000000..9d5e027
+index 0000000..b7f1745
--- /dev/null
+++ b/drivers/char/drm/via_dmablit.c
@@ -0,0 +1,805 @@
@@ -7007,7 +8257,7 @@
+ int num_desc = 0;
+ int cur_line;
+ dma_addr_t next = 0 | VIA_DMA_DPR_EC;
-+ drm_via_descriptor_t *desc_ptr = 0;
++ drm_via_descriptor_t *desc_ptr = NULL;
+
+ if (mode == 1)
+ desc_ptr = vsg->desc_pages[cur_descriptor_page];
@@ -7066,7 +8316,7 @@
+ */
+
+
-+void
++static void
+via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg)
+{
+ struct page *page;
@@ -7480,7 +8730,7 @@
+ int ret = 0;
+
+ vsg->direction = (draw) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
-+ vsg->bounce_buffer = 0;
++ vsg->bounce_buffer = NULL;
+
+ vsg->state = dr_via_sg_init;
+
@@ -8060,7 +9310,7 @@
return drm_init(&driver);
}
diff --git a/drivers/char/drm/via_drv.h b/drivers/char/drm/via_drv.h
-index 7d5daf4..aad4f99 100644
+index 7d5daf4..52bcc7b 100644
--- a/drivers/char/drm/via_drv.h
+++ b/drivers/char/drm/via_drv.h
@@ -24,24 +24,26 @@
@@ -8125,7 +9375,7 @@
/* VIA MMIO register access */
#define VIA_BASE ((dev_priv->mmio))
-@@ -92,12 +101,31 @@ typedef struct drm_via_private {
+@@ -92,12 +101,26 @@ typedef struct drm_via_private {
#define VIA_READ8(reg) DRM_READ8(VIA_BASE, reg)
#define VIA_WRITE8(reg,val) DRM_WRITE8(VIA_BASE, reg, val)
@@ -8138,11 +9388,6 @@
+extern int via_agp_init(DRM_IOCTL_ARGS);
+extern int via_map_init(DRM_IOCTL_ARGS);
+extern int via_decoder_futex(DRM_IOCTL_ARGS);
-+extern int via_dma_init(DRM_IOCTL_ARGS);
-+extern int via_cmdbuffer(DRM_IOCTL_ARGS);
-+extern int via_flush_ioctl(DRM_IOCTL_ARGS);
-+extern int via_pci_cmdbuffer(DRM_IOCTL_ARGS);
-+extern int via_cmdbuf_size(DRM_IOCTL_ARGS);
+extern int via_wait_irq(DRM_IOCTL_ARGS);
+extern int via_dma_blit_sync( DRM_IOCTL_ARGS );
+extern int via_dma_blit( DRM_IOCTL_ARGS );
@@ -8159,12 +9404,9 @@
extern int via_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence);
extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS);
-@@ -111,8 +139,10 @@ extern int via_driver_dma_quiescent(drm_
- extern void via_init_futex(drm_via_private_t * dev_priv);
+@@ -112,7 +135,7 @@ extern void via_init_futex(drm_via_priva
extern void via_cleanup_futex(drm_via_private_t * dev_priv);
extern void via_release_futex(drm_via_private_t * dev_priv, int context);
-+extern int via_driver_irq_wait(drm_device_t * dev, unsigned int irq,
-+ int force_sequence, unsigned int *sequence);
-extern int via_parse_command_stream(drm_device_t * dev, const uint32_t * buf,
- unsigned int size);
@@ -8193,7 +9435,7 @@
#include "via_ds.h"
extern unsigned int VIA_DEBUG;
diff --git a/drivers/char/drm/via_irq.c b/drivers/char/drm/via_irq.c
-index d023add..56d7e3d 100644
+index d023add..6152415 100644
--- a/drivers/char/drm/via_irq.c
+++ b/drivers/char/drm/via_irq.c
@@ -50,6 +50,15 @@
@@ -8251,15 +9493,6 @@
}
cur_irq++;
}
-@@ -165,7 +190,7 @@ int via_driver_vblank_wait(drm_device_t
- return ret;
- }
-
--static int
-+int
- via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence,
- unsigned int *sequence)
- {
@@ -174,6 +199,7 @@ via_driver_irq_wait(drm_device_t * dev,
drm_via_irq_t *cur_irq = dev_priv->via_irqs;
int ret = 0;
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1898
retrieving revision 1.1899
diff -u -r1.1898 -r1.1899
--- kernel-2.6.spec 2 Feb 2006 23:41:38 -0000 1.1898
+++ kernel-2.6.spec 3 Feb 2006 16:34:55 -0000 1.1899
@@ -208,7 +208,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.16-rc1.bz2
+Patch1: patch-2.6.16-rc2.bz2
Patch2: patch-2.6.16-rc1-git6.bz2
Patch3: drm.patch
@@ -592,7 +592,7 @@
# Update to latest upstream.
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
# Backout broken DRM changes.
%patch3 -p1 -R
@@ -1383,6 +1383,9 @@
%endif
%changelog
+* Fri Feb 3 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2
+
* Thu Feb 2 2006 Dave Jones <davej at redhat.com>
- 2.6.16rc1-git6
- enable the periodic slab debugger again.
linux-2.6-debug-singlebiterror.patch:
slab.c | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+)
Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-singlebiterror.patch 3 Feb 2006 05:07:37 -0000 1.5
+++ linux-2.6-debug-singlebiterror.patch 3 Feb 2006 16:34:55 -0000 1.6
@@ -29,21 +29,20 @@
printk(" %02x", (unsigned char)data[offset + i]);
}
printk("\n");
-@@ -1019,6 +1023,24 @@ static void dump_line(char *data, int of
+@@ -1019,6 +1023,23 @@ static void dump_line(char *data, int of
}
}
printk("\n");
+ if (bad_count == 1)
+ switch (total) {
-+ /* 01101011 (0x6b - SLAB_POISON) */
-+ case 0x6a: /* 01101010 bit 0 flipped */
-+ case 0x69: /* 01101001 bit 1 flipped */
-+ case 0x6f: /* 01101111 bit 2 flipped */
-+ case 0x63: /* 01100011 bit 3 flipped */
-+ case 0x7b: /* 01111011 bit 4 flipped */
-+ case 0x4b: /* 01001011 bit 5 flipped */
-+ case 0x2b: /* 00101011 bit 6 flipped */
-+ case 0xeb: /* 11101011 bit 7 flipped */
++ case POISON_FREE ^ 0x01:
++ case POISON_FREE ^ 0x02:
++ case POISON_FREE ^ 0x04:
++ case POISON_FREE ^ 0x08:
++ case POISON_FREE ^ 0x10:
++ case POISON_FREE ^ 0x20:
++ case POISON_FREE ^ 0x40:
++ case POISON_FREE ^ 0x80:
+ printk (KERN_ERR "Single bit error detected. Possibly bad RAM.\n");
+#ifdef CONFIG_X86
+ printk (KERN_ERR "Run memtest86 or other memory test tool.\n");
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- sources 2 Feb 2006 21:20:36 -0000 1.277
+++ sources 3 Feb 2006 16:34:55 -0000 1.278
@@ -1,4 +1,4 @@
cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2
-fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2
ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2
4bb74f4fb52bda3d1912960acc017861 patch-2.6.16-rc1-git6.bz2
+7b79682e01dbb03e5ede7b370d0202dc patch-2.6.16-rc2.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- upstream 2 Feb 2006 21:20:36 -0000 1.252
+++ upstream 3 Feb 2006 16:34:55 -0000 1.253
@@ -1,3 +1,3 @@
linux-2.6.15.tar.bz2
-patch-2.6.16-rc1.bz2
+patch-2.6.16-rc2.bz2
patch-2.6.16-rc1-git6.bz2
More information about the fedora-cvs-commits
mailing list