Thu Jan 29 21:14:43 UTC 2009

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9546

Modified Files:
	.cvsignore drm-modesetting-radeon.patch kernel.spec 
	linux-2.6-debug-taint-vm.patch 
	linux-2.6-debug-vm-would-have-oomkilled.patch 
	linux-2.6-defaults-pci_no_msi.patch linux-2.6-execshield.patch 
	linux-2.6-hdpvr.patch linux-2.6-selinux-mprotect-checks.patch 
	linux-2.6-sparc-selinux-mprotect-checks.patch 
	linux-2.6-utrace.patch sources upstream 
Added Files:
	patch-2.6.29-rc3.bz2.sign 
Removed Files:
	disable-p4-cpufreq-ui.patch iwlwifi-intel-bug-1822.patch 
	linux-2.6-net-silence-noisy-printks.patch 
	linux-2.6-olpc-speaker-out.patch 
	linux-2.6-piix3-silence-quirk.patch 
	linux-2.6-rtl8187b-tx-status-feedback.patch 
	linux-2.6-selinux-move-open-perms-check.patch 
	linux-2.6-serial.patch linux-2.6-squashfs.patch 
	linux-2.6.27-pci-hush-allocation-failures.patch 
	patch-2.6.28.2.bz2.sign 
	skip-sanity-check-of-busy-resources.patch 
Log Message:
Sync with rawhide 2.6.29-rc3 -- still needs config files updating.

--- NEW FILE patch-2.6.29-rc3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJgLHQyGugalF9Dw4RAtLhAJ9pr92MP22mBsyYTRSc+HuSA9xvhgCfTz4/
IJ9/jtVbprCGGhCLsj8A7/I=
=n0R6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.966
retrieving revision 1.967
diff -u -r1.966 -r1.967
--- .cvsignore	26 Jan 2009 21:11:19 -0000	1.966
+++ .cvsignore	29 Jan 2009 21:14:10 -0000	1.967
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28.2.bz2
+patch-2.6.29-rc3.bz2

drm-modesetting-radeon.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.70 -r 1.71 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- drm-modesetting-radeon.patch	20 Jan 2009 05:11:51 -0000	1.70
+++ drm-modesetting-radeon.patch	29 Jan 2009 21:14:11 -0000	1.71
@@ -1,1496 +1,5 @@
-commit ea9f35fbb0ad27833bb78e29d1118516855fb819
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Dec 19 11:01:33 2008 +1000
-
-    drm: fix problem with master enable
-
-commit 6361ff89314f0e48c6a70c71f836bcfe2a1083ee
-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
-
-commit 353c7a5dbb898188407d8e54fd6983a2006b16ad
-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 017e784508024b64217d0d4e31aa580261d83331
-Author: Dave Airlie <airlied at ppcg5.localdomain>
-Date:   Wed Dec 3 17:22:07 2008 +1100
-
-    radeon: add support for accessing disabled ROMs.
-
-commit d3c95991acabea7873a6675a6ff6d386465cf4c3
-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 b842e47ab42035dad7a521b2fc8c6105c7208151
-Author: Dave Airlie <airlied at ppcg5.localdomain>
-Date:   Wed Dec 3 16:36:00 2008 +1100
-
-    radeon: atom fixes for endianness
-
-commit d948ab5e334cb9046fade3fefac793efc1290699
-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 60a11e6a15441b1d67d09965fa389ba0373b7acd
-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 39106b8526ff66acdb2076b4623cd2bea3d28c76
-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 aaa952a952eb64206b29d61ccc128298a45d9c2b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 28 09:19:47 2008 +1000
-
-    drm: cleanup exit path mess using a linked list.
-    
-    Just keep a list of devices per driver and cleanup on exit
-
-commit 0dfc2a5fffbd76713ddbbb7c126294d08c1b30e0
-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 c9f53c74f29866a2fadddf3b707919234fad4b80
-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 7a6f7c80bae14c04a65ed4928f57f7de2b600cf3
-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 5465b46ca8abfeb61f39b8b1ca538f04b8e2fe7b
-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 b45ca3c31577279e17e17ccd1540c90400d175ac
-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 bdedddaf3f368728f377d32bf937bb03f35c7ba4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 21 14:52:25 2008 +1000
-
-    atom: fix bug in parser for MC reads
-
-commit a992cf31c94ac486eb8405952161d2502f417a44
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 18:14:28 2008 +1000
-
-    radeon: turn of VRAM zeroing by default for now - needs work
-
-commit 81c801b34d01255649ef2bc231f43e7344d6ff90
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 16:59:00 2008 +1000
-
-    drm: make 800x600 be standard not 640x480
-
-commit 81e18dc62a8f0469f1ed04f694fc814a65ed72dd
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 09:03:36 2008 +1000
-
-    radeon: fix return value for no relocs
-
-commit 6054ddc84d750bb70874f4f1dcd0cd3abd8a3967
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 09:03:01 2008 +1000
-
-    ttm: add discard for VRAM buffers
-
-commit 38294b6249209590c1a6ec58918d667059b74fbf
-Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
-Date:   Fri Nov 14 15:52:32 2008 +1000
-
-    drm: fix the exit path of the bo unlocking
-
-commit 61326321f05996df4a7f5c99448e381ae7f040f0
-Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
-Date:   Fri Nov 14 15:51:44 2008 +1000
-
-    radeon: fixup relocate to work on locate write buffers in VRAM first.
-    
-    Fixup failure paths and make EAGAIN work
-
-commit d02319fbc7734c82c596528c77df5e4fde8d1903
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 13 17:22:26 2008 +1100
-
-    radeon: fix some issues since last rebase
-
-commit 14b60f40e2f00b4ad8989ad60c415f2c99a56090
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 12 09:01:14 2008 +1000
-
-    radeon: fix more build
-
-commit 1aa88d3221f8aac073206177cbcbca3c14aae38a
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 12 08:59:04 2008 +1000
-
-    radeon: fix compile
-
-commit bcac3a5b6b01a03a479e1792f2527b1043187aea
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 12 08:58:55 2008 +1000
-
-    i915: fix master bits
-
-commit 1bccac92f4e1a1ffdf3f9e8d1360d79265545b49
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 10 15:39:25 2008 +1000
-
-    radeon: fix dumbness in cp ring check
-
-commit cb2732b2fbf0d24c31ab74c7be99aa3afd6cae08
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 10 14:26:11 2008 +1000
-
-    radeon: add gart useable size to report to userspace
-
[...13169 lines suppressed...]
- #if defined(__alpha__)
--#define SAREA_MAX                       0x2000
-+#define SAREA_MAX                       0x2000UL
- #elif defined(__ia64__)
--#define SAREA_MAX                       0x10000	/* 64kB */
-+#define SAREA_MAX                       0x10000UL	/* 64kB */
- #else
- /* Intel 830M driver needs at least 8k SAREA */
--#define SAREA_MAX                       0x2000
-+#define SAREA_MAX                       0x2000UL
- #endif
- 
- /** Maximum number of drawables in the SAREA */
 diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index 152b34d..13c91fc 100644
+index b3bcf72..181d9de 100644
 --- a/include/drm/i915_drm.h
 +++ b/include/drm/i915_drm.h
-@@ -63,7 +63,7 @@ typedef struct _drm_i915_init {
- 	unsigned int chipset;
- } drm_i915_init_t;
- 
--typedef struct _drm_i915_sarea {
-+typedef struct drm_i915_sarea {
- 	struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
- 	int last_upload;	/* last time texture was uploaded */
- 	int last_enqueue;	/* last time a buffer was enqueued */
-@@ -105,14 +105,26 @@ typedef struct _drm_i915_sarea {
- 	unsigned int rotated_tiled;
- 	unsigned int rotated2_tiled;
- 
--	int pipeA_x;
--	int pipeA_y;
--	int pipeA_w;
--	int pipeA_h;
--	int pipeB_x;
--	int pipeB_y;
--	int pipeB_w;
--	int pipeB_h;
-+	int planeA_x;
-+	int planeA_y;
-+	int planeA_w;
-+	int planeA_h;
-+	int planeB_x;
-+	int planeB_y;
-+	int planeB_w;
-+	int planeB_h;
-+
-+	/* triple buffering - not in kernel */
-+	drm_handle_t third_handle;
-+	int third_offset;
-+	int third_size;
-+	unsigned int third_tiled;
-+
-+	/* buffer object handles for static buffers */
-+	unsigned int front_bo_handle;
-+	unsigned int back_bo_handle;
-+	unsigned int third_bo_handle;
-+	unsigned int depth_bo_handle;
- } drm_i915_sarea_t;
- 
- /* Flags for perf_boxes
-@@ -163,7 +175,7 @@ typedef struct _drm_i915_sarea {
+@@ -187,7 +187,7 @@ typedef struct _drm_i915_sarea {
  
  #define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
  #define DRM_IOCTL_I915_FLUSH		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
@@ -45303,16 +34695,7 @@
  #define DRM_IOCTL_I915_BATCHBUFFER	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t)
  #define DRM_IOCTL_I915_IRQ_EMIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
  #define DRM_IOCTL_I915_IRQ_WAIT         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
-@@ -177,6 +189,8 @@ typedef struct _drm_i915_sarea {
- #define DRM_IOCTL_I915_SET_VBLANK_PIPE	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
- #define DRM_IOCTL_I915_GET_VBLANK_PIPE	DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
- #define DRM_IOCTL_I915_VBLANK_SWAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
-+#define DRM_IOCTL_I915_GEM_INIT         DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_INIT, struct drm_i915_gem_init)
-+#define DRM_IOCTL_I915_GEM_EXECBUFFER   DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER, struct drm_i915_gem_execbuffer)
- #define DRM_IOCTL_I915_GEM_PIN		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
- #define DRM_IOCTL_I915_GEM_UNPIN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
- #define DRM_IOCTL_I915_GEM_BUSY		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
-@@ -193,10 +207,22 @@ typedef struct _drm_i915_sarea {
+@@ -220,6 +220,18 @@ typedef struct _drm_i915_sarea {
  #define DRM_IOCTL_I915_GEM_GET_TILING	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
  #define DRM_IOCTL_I915_GEM_GET_APERTURE	DRM_IOR  (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture)
  
@@ -45331,13 +34714,8 @@
  /* Allow drivers to submit batchbuffers directly to hardware, relying
   * on the security mechanisms provided by hardware.
   */
--typedef struct _drm_i915_batchbuffer {
-+typedef struct drm_i915_batchbuffer {
- 	int start;		/* agp offset */
- 	int used;		/* nr bytes in use */
- 	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
 diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..770f6f0 100644
+index 73ff51f..1f67a11 100644
 --- a/include/drm/radeon_drm.h
 +++ b/include/drm/radeon_drm.h
 @@ -453,6 +453,15 @@ typedef struct {
@@ -45356,7 +34734,7 @@
  } drm_radeon_sarea_t;
  
  /* WARNING: If you change any of these defines, make sure to change the
-@@ -493,6 +502,19 @@ typedef struct {
+@@ -493,6 +502,18 @@ typedef struct {
  #define DRM_RADEON_SURF_ALLOC 0x1a
  #define DRM_RADEON_SURF_FREE  0x1b
  
@@ -45370,13 +34748,12 @@
 +#define DRM_RADEON_GEM_SET_DOMAIN 0x23
 +#define DRM_RADEON_GEM_WAIT_RENDERING 0x24
 +
-+#define DRM_RADEON_CS           0x25
-+#define DRM_RADEON_CS2       0x26
++#define DRM_RADEON_CS       0x26
 +
  #define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
  #define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
  #define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
-@@ -521,6 +543,19 @@ typedef struct {
+@@ -521,6 +542,18 @@ typedef struct {
  #define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
  #define DRM_IOCTL_RADEON_SURF_FREE  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
  
@@ -45390,21 +34767,21 @@
 +#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
 +#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
 +#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
-+#define DRM_IOCTL_RADEON_CS2 DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS2, struct drm_radeon_cs2)
 +
 +
  typedef struct drm_radeon_init {
  	enum {
  		RADEON_INIT_CP = 0x01,
-@@ -677,6 +712,7 @@ typedef struct drm_radeon_indirect {
+@@ -677,6 +710,8 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
 +#define RADEON_PARAM_KERNEL_MM             16
++#define RADEON_PARAM_DEVICE_ID		   17
  
  typedef struct drm_radeon_getparam {
  	int param;
-@@ -731,6 +767,7 @@ typedef struct drm_radeon_setparam {
+@@ -731,6 +766,7 @@ typedef struct drm_radeon_setparam {
  #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
  #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
  #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
@@ -45412,7 +34789,7 @@
  /* 1.14: Clients can allocate/free a surface
   */
  typedef struct drm_radeon_surface_alloc {
-@@ -746,4 +783,114 @@ typedef struct drm_radeon_surface_free {
+@@ -746,4 +782,106 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
@@ -45500,14 +34877,6 @@
 +
 +/* New interface which obsolete all previous interface.
 + */
-+
-+
-+struct drm_radeon_cs {
-+	uint32_t            dwords;
-+	uint32_t            cs_id;
-+	uint64_t            packets;
-+};
-+
 +#define RADEON_CHUNK_ID_RELOCS 0x01
 +#define RADEON_CHUNK_ID_IB     0x02
 +#define RADEON_CHUNK_ID_OLD 0xff
@@ -45518,7 +34887,7 @@
 +	uint64_t chunk_data;
 +};
 +
-+struct drm_radeon_cs2 {
++struct drm_radeon_cs {
 +	uint32_t	num_chunks;
 +	uint32_t        cs_id;
 +	uint64_t	chunks; /* this points to uint64_t * which point to
@@ -45527,16 +34896,3 @@
 +
 +
  #endif
-diff --git a/include/linux/console.h b/include/linux/console.h
-index 248e6e3..a67a90c 100644
---- a/include/linux/console.h
-+++ b/include/linux/console.h
-@@ -153,4 +153,8 @@ void vcs_remove_sysfs(struct tty_struct *tty);
- #define VESA_HSYNC_SUSPEND      2
- #define VESA_POWERDOWN          3
- 
-+#ifdef CONFIG_VGA_CONSOLE
-+extern bool vgacon_text_force(void);
-+#endif
-+
- #endif /* _LINUX_CONSOLE_H */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1231
retrieving revision 1.1232
diff -u -r1.1231 -r1.1232
--- kernel.spec	27 Jan 2009 03:54:02 -0000	1.1231
+++ kernel.spec	29 Jan 2009 21:14:11 -0000	1.1232
@@ -3,7 +3,7 @@
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%define released_kernel 1
+%define released_kernel 0
 
 # Versions of various parts
 
@@ -20,7 +20,7 @@
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
 #
-%define fedora_cvs_origin   1207
+%define fedora_cvs_origin   1230
 %define fedora_build_string %(R="$Revision$"; R="${R%% \$}"; R="${R#: 1.}"; echo $R)
 %define fedora_build_origin %(R=%{fedora_build_string}; R="${R%%%%.*}"; echo $R)
 %define fedora_build_prefix %(expr %{fedora_build_origin} - %{fedora_cvs_origin})
@@ -55,7 +55,7 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 0
+%define rcrev 3
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -614,22 +614,17 @@
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
-Patch420: linux-2.6-squashfs.patch
-Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
-Patch590: linux-2.6-selinux-move-open-perms-check.patch
 
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
-Patch680: iwlwifi-intel-bug-1822.patch
-Patch681: linux-2.6-rtl8187b-tx-status-feedback.patch
 Patch682: linux-2.6-rt2x00-asus-leds.patch
 
 Patch690: linux-2.6-at76.patch
@@ -659,28 +654,14 @@
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
 # olpc fixes
-Patch2040: linux-2.6-olpc-speaker-out.patch
-
-# Fix serial header so things can compile (#476327)
-Patch2050: linux-2.6-serial.patch
 
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
 
 # Quiet boot fixes
-# silence piix3 in quiet boot (ie, qemu)
-Patch2800: linux-2.6-piix3-silence-quirk.patch
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
-# hush pci bar allocation failures
-Patch2804: linux-2.6.27-pci-hush-allocation-failures.patch
-
-# Provide P4 clock modulation in-kernel for thermal reasons, but don't expose
-# ui
-Patch3130: disable-p4-cpufreq-ui.patch
-
-Patch9000: skip-sanity-check-of-busy-resources.patch
 
 %endif
 
@@ -1079,9 +1060,6 @@
 # bugfixes to drivers and filesystems
 #
 
-# Squashfs
-ApplyPatch linux-2.6-squashfs.patch
-
 # ext4
 
 # xfs
@@ -1109,9 +1087,9 @@
 # disable message signaled interrupts
 ApplyPatch linux-2.6-defaults-pci_no_msi.patch
 # update the pciehp driver
-ApplyPatch linux-2.6-pciehp-update.patch
+#ApplyPatch linux-2.6-pciehp-update.patch
 # default to enabling passively listening for hotplug events
-ApplyPatch linux-2.6-defaults-pciehp.patch
+#ApplyPatch linux-2.6-defaults-pciehp.patch
 
 #
 # SCSI Bits.
@@ -1122,8 +1100,6 @@
 # ALSA
 
 # Networking
-# Disable easy to trigger printk's.
-ApplyPatch linux-2.6-net-silence-noisy-printks.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1141,8 +1117,6 @@
 ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 # Fix SELinux for sparc
 ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
-# SELinux: check open perms in dentry_open not inode_permission
-ApplyPatch linux-2.6-selinux-move-open-perms-check.patch
 
 # Changes to upstream defaults.
 
@@ -1152,12 +1126,6 @@
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
-# iwlwifi: avoid rs_get_rate warnings
-ApplyPatch iwlwifi-intel-bug-1822.patch
-
-# rtl8187: feedback transmitted packets using tx close descriptor for 8187B
-ApplyPatch linux-2.6-rtl8187b-tx-status-feedback.patch
-
 # rt2x00: back-port activity LED init patches
 ApplyPatch linux-2.6-rt2x00-asus-leds.patch
 
@@ -1165,8 +1133,8 @@
 ApplyPatch linux-2.6-at76.patch
 
 # Webcam patches
-ApplyPatch linux-2.6-gspca-git.patch
-ApplyPatch linux-2.6-gspca-stv06xx-git.patch
+#ApplyPatch linux-2.6-gspca-git.patch
+#ApplyPatch linux-2.6-gspca-stv06xx-git.patch
 
 # http://www.lirc.org/
 ApplyPatch linux-2.6.27-lirc.patch
@@ -1184,10 +1152,6 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
-ApplyPatch linux-2.6-olpc-speaker-out.patch
-
-ApplyPatch linux-2.6-serial.patch
-
 # Nouveau DRM + drm fixes
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-nouveau.patch
@@ -1199,17 +1163,8 @@
 ApplyPatch linux-2.6-firewire-git-pending.patch
 fi
 
-# silence piix3 in quiet boot (ie, qemu)
-ApplyPatch linux-2.6-piix3-silence-quirk.patch
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
-# hush pci bar allocation failures
-ApplyPatch linux-2.6.27-pci-hush-allocation-failures.patch
-
-ApplyPatch disable-p4-cpufreq-ui.patch
-
-# fix #480700, acpi ec ioremap WARN_ON
-ApplyPatch skip-sanity-check-of-busy-resources.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1787,6 +1742,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.2.rc3
+- Sync with rawhide 2.6.29-rc3 -- still needs config files updating.
+
 * Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-24
 - add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
   sanity check WARN_ON due to acpi ec.

linux-2.6-debug-taint-vm.patch:

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-2.6-debug-taint-vm.patch	12 Jan 2009 19:51:28 -0000	1.22
+++ linux-2.6-debug-taint-vm.patch	29 Jan 2009 21:14:11 -0000	1.23
@@ -1,8 +1,8 @@
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 4d50883..f4a6faa 100644
+index 2a2ff36..361d852 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -193,6 +193,7 @@ const char *print_tainted(void)
+@@ -194,6 +194,7 @@ const char *print_tainted(void)
  		snprintf(buf, sizeof(buf), "Not tainted");
  	return(buf);
  }
@@ -10,7 +10,7 @@
  
  int test_taint(unsigned flag)
  {
-@@ -328,8 +329,8 @@ void warn_on_slowpath(const char *file, int line)
+@@ -334,8 +335,8 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...)
  	sprint_symbol(function, caller);
  
  	printk(KERN_WARNING "------------[ cut here ]------------\n");
@@ -18,28 +18,28 @@
 -		line, function);
 +	printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file,
 +		line, function, print_tainted());
- 	print_modules();
- 	dump_stack();
- 	print_oops_end_marker();
+ 	board = dmi_get_system_info(DMI_PRODUCT_NAME);
+ 	if (board)
+ 		printk(KERN_WARNING "Hardware name: %s\n", board);
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index d8ac014..1d035f0 100644
+index 5675b30..ae3e7ff 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -224,10 +224,10 @@ static inline int bad_range(struct zone *zone, struct page *page)
- static void bad_page(struct page *page)
- {
- 	printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG
--		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
-+		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
- 		current->comm, page, (int)(2*sizeof(unsigned long)),
- 		(unsigned long)page->flags, page->mapping,
--		page_mapcount(page), page_count(page));
-+		page_mapcount(page), page_count(page), print_tainted());
+@@ -250,9 +250,10 @@ static void bad_page(struct page *page)
+ 	printk(KERN_ALERT "BUG: Bad page state in process %s  pfn:%05lx\n",
+ 		current->comm, page_to_pfn(page));
+ 	printk(KERN_ALERT
+-		"page:%p flags:%p count:%d mapcount:%d mapping:%p index:%lx\n",
++		"page:%p flags:%p count:%d mapcount:%d mapping:%p ",
+ 		page, (void *)page->flags, page_count(page),
+-		page_mapcount(page), page->mapping, page->index);
++		page_mapcount(page), page->mapping);
++	printk(KERN_CONT "index:%lx (%s)\n", page->index, print_tainted());
  
- 	printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
- 		KERN_EMERG "Backtrace:\n");
+ 	dump_stack();
+ out:
 diff --git a/mm/slab.c b/mm/slab.c
-index 0918751..0977a03 100644
+index ddc41f3..bf54397 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
 @@ -1858,8 +1858,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
@@ -53,7 +53,7 @@
  				print_objinfo(cachep, objp, 0);
  			}
  			/* Hexdump the affected line */
-@@ -2928,8 +2928,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
+@@ -2930,8 +2930,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
  	if (entries != cachep->num - slabp->inuse) {
  bad:
  		printk(KERN_ERR "slab: Internal list corruption detected in "
@@ -65,10 +65,10 @@
  		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
  		     i++) {
 diff --git a/mm/slub.c b/mm/slub.c
-index 749588a..0ef64f1 100644
+index 6392ae5..4f6acce 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -430,7 +430,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
+@@ -435,7 +435,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
  	va_end(args);
  	printk(KERN_ERR "========================================"
  			"=====================================\n");

linux-2.6-debug-vm-would-have-oomkilled.patch:

Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-vm-would-have-oomkilled.patch	29 Mar 2008 19:03:01 -0000	1.1
+++ linux-2.6-debug-vm-would-have-oomkilled.patch	29 Jan 2009 21:14:11 -0000	1.2
@@ -29,12 +29,12 @@
 index f255eda..3335a94 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
-@@ -30,6 +30,7 @@
+@@ -31,6 +31,7 @@
  int sysctl_panic_on_oom;
  int sysctl_oom_kill_allocating_task;
  int sysctl_oom_dump_tasks;
 +int sysctl_would_have_oomkilled;
- static DEFINE_SPINLOCK(zone_scan_mutex);
+ static DEFINE_SPINLOCK(zone_scan_lock);
  /* #define DEBUG */
  
 @@ -321,6 +322,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)

linux-2.6-defaults-pci_no_msi.patch:

Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-defaults-pci_no_msi.patch	12 Jan 2009 19:51:29 -0000	1.2
+++ linux-2.6-defaults-pci_no_msi.patch	29 Jan 2009 21:14:11 -0000	1.3
@@ -25,9 +25,9 @@
  
  /* Arch hooks */
  
-@@ -755,6 +755,11 @@ void pci_no_msi(void)
- 	pci_msi_enable = 0;
+@@ -788,6 +788,11 @@ int pci_msi_enabled(void)
  }
+ EXPORT_SYMBOL(pci_msi_enabled);
  
 +void pci_yes_msi(void)
 +{
@@ -50,20 +50,17 @@
  			} else if (!strcmp(str, "noaer")) {
  				pci_no_aer();
  			} else if (!strcmp(str, "nodomains")) {
-diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index 9de87e9..c0327e7 100644
---- a/drivers/pci/pci.h
-+++ b/drivers/pci/pci.h
-@@ -97,10 +97,12 @@ extern unsigned int pci_pm_d3_delay;
+--- linux-2.6.28.noarch/drivers/pci/pci.h~	2009-01-08 09:45:35.000000000 -0500
++++ linux-2.6.28.noarch/drivers/pci/pci.h	2009-01-08 09:45:49.000000000 -0500
+@@ -105,9 +105,11 @@ extern unsigned int pci_pm_d3_delay;
  
  #ifdef CONFIG_PCI_MSI
  void pci_no_msi(void);
 +void pci_yes_msi(void);
  extern void pci_msi_init_pci_dev(struct pci_dev *dev);
- extern void __devinit msi_init(void);
  #else
  static inline void pci_no_msi(void) { }
 +static inline void pci_yes_msi(void) { }
  static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
- static inline void msi_init(void) { }
  #endif
+ 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-execshield.patch,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- linux-2.6-execshield.patch	19 Jan 2009 06:21:32 -0000	1.99
+++ linux-2.6-execshield.patch	29 Jan 2009 21:14:11 -0000	1.100
@@ -1,5 +1,5 @@
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index e6b82b1..aea00b6 100644
+index dc27705..34ed3a2 100644
 --- a/arch/x86/include/asm/desc.h
 +++ b/arch/x86/include/asm/desc.h
 @@ -6,6 +6,7 @@
@@ -20,7 +20,7 @@
  
  #define write_ldt_entry(dt, entry, desc)	\
  	native_write_ldt_entry(dt, entry, desc)
-@@ -381,6 +385,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+@@ -379,6 +383,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -37,11 +37,11 @@
 +	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs;
 +}
 +
-+#define arch_add_exec_range	arch_add_exec_range
++#define arch_add_exec_range arch_add_exec_range
++#define arch_remove_exec_range arch_remove_exec_range
++#define arch_flush_exec_range arch_flush_exec_range
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
-+#define arch_remove_exec_range	arch_remove_exec_range
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
-+#define arch_flush_exec_range	arch_flush_exec_range
 +extern void arch_flush_exec_range(struct mm_struct *mm);
 +#endif /* CONFIG_X86_32 */
 +
@@ -100,10 +100,10 @@
  {
  	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index 5ca01e3..4f319b1 100644
+index 091cd88..b1a6f6d 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
-@@ -154,6 +154,9 @@ static inline int hlt_works(int cpu)
+@@ -158,6 +158,9 @@ static inline int hlt_works(int cpu)
  
  #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
  
@@ -114,10 +114,10 @@
  
  extern struct pt_regs *idle_regs(struct pt_regs *);
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index b9c9ea0..666dd0e 100644
+index 83492b1..a84c787 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -687,6 +687,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -708,6 +708,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	 * we do "generic changes."
  	 */
  
@@ -154,19 +154,19 @@
  	.load_idt = native_load_idt,
  	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 0a1302f..7d5927e 100644
+index a546f55..f180caf 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -345,6 +345,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+@@ -346,6 +346,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
  void
  start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  {
 +	int cpu;
 +
- 	__asm__("movl %0, %%gs" :: "r"(0));
+ 	__asm__("movl %0, %%gs" : : "r"(0));
  	regs->fs		= 0;
  	set_fs(USER_DS);
-@@ -354,6 +356,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -355,6 +357,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  	regs->cs		= __USER_CS;
  	regs->ip		= new_ip;
  	regs->sp		= new_sp;
@@ -178,7 +178,7 @@
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -558,7 +565,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
+@@ -522,7 +529,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -188,7 +188,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-@@ -731,3 +739,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -695,3 +703,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -198,7 +198,9 @@
 +	mm->context.exec_limit = limit;
 +	set_user_cs(&mm->context.user_cs, limit);
 +	if (mm == current->mm) {
-+		int cpu = get_cpu();
++		int cpu;
++
++		cpu = get_cpu();
 +		load_user_cs_desc(cpu, mm);
 +		put_cpu();
 +	}
@@ -229,7 +231,7 @@
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
 diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
-index f4049f3..e7a1b7c 100644
+index ce50546..bd6593a 100644
 --- a/arch/x86/kernel/tlb_32.c
 +++ b/arch/x86/kernel/tlb_32.c
 @@ -2,6 +2,7 @@
@@ -240,7 +242,7 @@
  #include <asm/tlbflush.h>
  
  DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
-@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+@@ -91,6 +92,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
  	unsigned long cpu;
  
  	cpu = get_cpu();
@@ -250,17 +252,17 @@
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 04d242a..e478f3b 100644
+index 98c2d05..db483ea 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -159,6 +159,74 @@ static int lazy_iobitmap_copy(void)
+@@ -154,6 +154,76 @@ static int lazy_iobitmap_copy(void)
  
  	return 0;
  }
 +
 +static inline int
-+__compare_user_cs_desc(const struct desc_struct * const desc1,
-+	const struct desc_struct * const desc2)
++__compare_user_cs_desc(const struct desc_struct *desc1,
++	const struct desc_struct *desc2)
 +{
 +	return ((desc1->limit0 != desc2->limit0) ||
 +		(desc1->limit != desc2->limit) ||
@@ -313,11 +315,13 @@
 +		 */
 +		if (print_fatal_signals >= 2) {
 +			printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+				error_code, error_code/8, regs->ip, cpu);
++				error_code, error_code/8, regs->ip,
++				smp_processor_id());
 +			printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x, CPU_cs: %08x/%08x.\n",
 +				current->mm->context.exec_limit,
 +				desc1->a, desc1->b, desc2->a, desc2->b);
 +		}
++
 +		load_user_cs_desc(cpu, current->mm);
 +
 +		return 1;
@@ -328,7 +332,7 @@
  #endif
  
  static void __kprobes
-@@ -320,6 +388,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -317,6 +387,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -346,7 +350,7 @@
 +
 +	if (print_fatal_signals) {
 +		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+			error_code, error_code/8, regs->ip, cpu);
++			error_code, error_code/8, regs->ip, smp_processor_id());
 +		printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x.\n",
 +			current->mm->context.exec_limit,
 +			current->mm->context.user_cs.a,
@@ -358,7 +362,7 @@
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -931,19 +1022,37 @@ do_device_not_available(struct pt_regs *regs, long error)
+@@ -923,19 +1016,37 @@ do_device_not_available(struct pt_regs *regs, long error)
  }
  
  #ifdef CONFIG_X86_32
@@ -406,10 +410,10 @@
  #endif
  
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index c483f42..8c3bbd9 100644
+index 88f1b10..1e31b5e 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
-@@ -570,7 +570,7 @@ static int disable_nx __initdata;
+@@ -575,7 +575,7 @@ static int disable_nx __initdata;
   * Control non executable mappings.
   *
   * on      Enable
@@ -418,7 +422,7 @@
   */
  static int __init noexec_setup(char *str)
  {
-@@ -579,14 +579,12 @@ static int __init noexec_setup(char *str)
+@@ -584,14 +584,12 @@ static int __init noexec_setup(char *str)
  			__supported_pte_mask |= _PAGE_NX;
  			disable_nx = 0;
  		}
@@ -439,7 +443,7 @@
  
  	return 0;
  }
-@@ -845,7 +843,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+@@ -850,7 +848,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
  	set_nx();
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
@@ -473,10 +477,10 @@
  	}
  }
 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 513f330..2fb420a 100644
+index 1241f11..3f2c44c 100644
 --- a/arch/x86/vdso/vdso32-setup.c
 +++ b/arch/x86/vdso/vdso32-setup.c
-@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  	if (compat)
  		addr = VDSO_HIGH_BASE;
  	else {
@@ -486,10 +490,10 @@
  			ret = addr;
  			goto up_fail;
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 5e4686d..b41f314 100644
+index bea2152..d750141 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -315,6 +315,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -316,6 +316,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
  	xen_mc_issue(PARAVIRT_LAZY_CPU);
  }
  
@@ -514,7 +518,7 @@
  static void xen_load_gdt(const struct desc_ptr *dtr)
  {
  	unsigned long *frames;
-@@ -1231,6 +1249,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -1232,6 +1250,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  
  	.load_tr_desc = paravirt_nop,
  	.set_ldt = xen_set_ldt,
@@ -525,7 +529,7 @@
  	.load_idt = xen_load_idt,
  	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 8fcfa39..5e1e2d8 100644
+index e3ff2b9..d46dcf2 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
 @@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
@@ -537,7 +541,7 @@
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -723,6 +723,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -735,6 +735,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  			break;
  		}
  
@@ -549,7 +553,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -742,6 +747,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -754,6 +759,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	if (retval)
  		goto out_free_dentry;
  
@@ -565,7 +569,7 @@
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
  	current->mm->def_flags = def_flags;
-@@ -749,7 +763,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -761,7 +775,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
  	SET_PERSONALITY(loc->elf_ex);
@@ -575,7 +579,7 @@
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -914,7 +929,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -926,7 +941,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  					    interpreter,
  					    &interp_map_addr,
  					    load_bias);
@@ -585,18 +589,21 @@
  			 * load_elf_interp() returns relocation
  			 * adjustment
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 6af7fba..bb98552 100644
+index 7e4877d..0c368c1 100644
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
-@@ -412,8 +412,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -424,8 +424,16 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  		unlock_task_sighand(task, &flags);
  	}
  
 -	if (!whole || num_threads < 2)
 -		wchan = get_wchan(task);
 +	if (!whole || num_threads < 2) {
++		const struct cred *cred;
++
 +		wchan = 0;
-+		if (current->uid == task->uid || current->euid == task->uid ||
++		cred = __task_cred(task);
++		if (current_uid() == cred->uid || current_euid() == cred->uid ||
 +			capable(CAP_SYS_NICE))
 +				wchan = get_wchan(task);
 +	}
@@ -605,10 +612,10 @@
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index ffee2f7..c14817b 100644
+index e8ddc98..bf87f4a 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1105,7 +1105,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1122,7 +1122,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -624,10 +631,10 @@
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index fe82547..8007dbf 100644
+index 92915e8..4bfd050 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -177,6 +177,9 @@ struct mm_struct {
+@@ -194,6 +194,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -655,12 +662,12 @@
  /*
   * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 55e30d1..d400ab0 100644
+index 4cae9b8..71fe593 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -97,6 +97,9 @@ struct futex_pi_state;
- struct robust_list_head;
+@@ -98,6 +98,9 @@ struct robust_list_head;
  struct bio;
+ struct bts_tracer;
  
 +extern int exec_shield;
 +extern int print_fatal_signals;
@@ -668,7 +675,7 @@
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -345,6 +348,10 @@ extern int sysctl_max_map_count;
+@@ -343,6 +346,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -680,13 +687,13 @@
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 3d56fe7..b512845 100644
+index 368d163..2e4ab66 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -82,6 +82,26 @@ extern int percpu_pagelist_fraction;
- extern int compat_log;
- extern int latencytop_enabled;
- extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -85,6 +85,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+ #ifndef CONFIG_MMU
+ extern int sysctl_nr_trim_pages;
+ #endif
 +
 +int exec_shield = (1<<0);
 +/* exec_shield is a bitmask:
@@ -710,7 +717,7 @@
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -373,6 +393,14 @@ static struct ctl_table kern_table[] = {
+@@ -378,6 +398,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -726,7 +733,7 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index d4855a6..ac07ab7 100644
+index 8d95902..c84ff1f 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -27,6 +27,7 @@
@@ -765,7 +772,7 @@
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -494,6 +509,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -493,6 +508,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -774,7 +781,7 @@
  }
  
  /*
-@@ -800,6 +817,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -799,6 +816,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -783,7 +790,7 @@
  		return prev;
  	}
  
-@@ -955,7 +974,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+@@ -954,7 +973,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -793,7 +800,7 @@
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1440,13 +1460,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1439,13 +1459,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -814,7 +821,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1460,8 +1484,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1459,8 +1483,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -891,8 +898,8 @@
 -EXPORT_SYMBOL(get_unmapped_area);
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
- struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
-@@ -1536,6 +1628,14 @@ out:
+ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+@@ -1535,6 +1627,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -907,7 +914,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1552,7 +1652,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1551,7 +1651,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -916,7 +923,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1862,10 +1962,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1861,10 +1961,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -933,7 +940,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2109,6 +2213,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2111,6 +2215,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -942,11 +949,11 @@
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index fded06f..a2cf942 100644
+index abe2694..eb16148 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -24,9 +24,14 @@
- #include <linux/mmu_notifier.h>
+@@ -25,9 +25,14 @@
+ #include <linux/migrate.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
@@ -960,7 +967,7 @@
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
  {
-@@ -140,7 +145,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -138,7 +143,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -969,7 +976,7 @@
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -204,6 +209,9 @@ success:
+@@ -202,6 +207,9 @@ success:
  		dirty_accountable = 1;
  	}
  
@@ -980,7 +987,7 @@
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 diff --git a/mm/mremap.c b/mm/mremap.c
-index 58a2908..5bb50e6 100644
+index a39b7b9..6bebfde 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
 @@ -400,8 +400,8 @@ unsigned long do_mremap(unsigned long addr,

linux-2.6-hdpvr.patch:

Index: linux-2.6-hdpvr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-hdpvr.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-hdpvr.patch	12 Jan 2009 19:51:29 -0000	1.2
+++ linux-2.6-hdpvr.patch	29 Jan 2009 21:14:11 -0000	1.3
@@ -1,8 +1,8 @@
 diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index 47102c2..0e279dd 100644
+index 19cf3b8..4f29e1a 100644
 --- a/drivers/media/video/Kconfig
 +++ b/drivers/media/video/Kconfig
-@@ -781,6 +781,8 @@ source "drivers/media/video/gspca/Kconfig"
+@@ -817,6 +817,8 @@ source "drivers/media/video/gspca/Kconfig"
  
  source "drivers/media/video/pvrusb2/Kconfig"
  
@@ -12,10 +12,10 @@
  
  source "drivers/media/video/usbvision/Kconfig"
 diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
-index 16962f3..4331a50 100644
+index 72f6d03..35ff442 100644
 --- a/drivers/media/video/Makefile
 +++ b/drivers/media/video/Makefile
-@@ -115,6 +115,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
+@@ -122,6 +122,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
  obj-$(CONFIG_USB_ZC0301)        += zc0301/
  obj-$(CONFIG_USB_GSPCA)         += gspca/
  
@@ -885,7 +885,7 @@
 +}
 diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
 new file mode 100644
-index 0000000..2378099
+index 0000000..0297f91
 --- /dev/null
 +++ b/drivers/media/video/hdpvr/hdpvr-video.c
 @@ -0,0 +1,1258 @@
@@ -1214,7 +1214,7 @@
 + * video 4 linux 2 file operations
 + */
 +
-+static int hdpvr_open(struct inode *inode, struct file *file)
++static int hdpvr_open(struct file *file)
 +{
 +	struct hdpvr_device *dev;
 +	struct hdpvr_fh *fh;
@@ -1253,7 +1253,7 @@
 +	return retval;
 +}
 +
-+
++#if 0
 +static void hdpvr_draw_down(struct hdpvr_device *dev)
 +{
 +	hdpvr_trace("status = %d", dev->status);
@@ -1279,8 +1279,9 @@
 +
 +	return 0;
 +}
++#endif
 +
-+static int hdpvr_release(struct inode *inode, struct file *file)
++static int hdpvr_release(struct file *file)
 +{
 +	struct hdpvr_fh		*fh  = (struct hdpvr_fh *)file->private_data;
 +	struct hdpvr_device	*dev = fh->dev;
@@ -1455,7 +1456,7 @@
 +}
 +
 +
-+static int hdpvr_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
++static long hdpvr_ioctl(struct file *filp, unsigned int cmd,
 +		unsigned long arg)
 +{
 +	struct hdpvr_fh *fh = (struct hdpvr_fh *)filp->private_data;
@@ -1490,21 +1491,20 @@
 +		break;
 +	}
 +	default:
-+		res = video_ioctl2(inode, filp, cmd, arg);
++		res = video_ioctl2(filp, cmd, arg);
 +	}
 +	mutex_unlock(&dev->io_mutex);
 +	return res;
 +}
 +
-+static const struct file_operations hdpvr_fops = {
++static const struct v4l2_file_operations hdpvr_fops = {
 +	.owner		= THIS_MODULE,
 +	.open		= hdpvr_open,
 +	.release	= hdpvr_release,
-+	.flush		= hdpvr_flush,
++/*	.flush		= hdpvr_flush,	*/
 +	.read		= hdpvr_read,
 +	.poll		= hdpvr_poll,
 +	.ioctl		= hdpvr_ioctl,
-+	.compat_ioctl	= v4l_compat_ioctl32,
 +};
 +
 +/*=======================================================================*/
@@ -2478,18 +2478,10 @@
 +void print_bytes(char *string, unsigned char *buf, size_t len);
 +#endif
 diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
-index 846763d..34eca15 100644
+index b8f2be8..0e8bd98 100644
 --- a/drivers/media/video/v4l2-common.c
 +++ b/drivers/media/video/v4l2-common.c
-@@ -374,6 +374,7 @@ const char *v4l2_ctrl_get_name(u32 id)
- 	case V4L2_CID_CONTRAST: 	return "Contrast";
- 	case V4L2_CID_SATURATION: 	return "Saturation";
- 	case V4L2_CID_HUE: 		return "Hue";
-+	case V4L2_CID_SHARPNESS: 	return "Sharpness";
- 
- 	/* MPEG controls */
- 	case V4L2_CID_MPEG_CLASS: 		return "MPEG Encoder Controls";
-@@ -480,6 +481,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
+@@ -547,6 +547,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
  	case V4L2_CID_CONTRAST:
  	case V4L2_CID_SATURATION:
  	case V4L2_CID_HUE:
@@ -2497,7 +2489,7 @@
  		qctrl->flags |= V4L2_CTRL_FLAG_SLIDER;
  		break;
  	}
-@@ -518,6 +520,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
+@@ -585,6 +586,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
  		return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64);
  	case V4L2_CID_HUE:
  		return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0);
@@ -2507,14 +2499,14 @@
  	/* MPEG controls */
  	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
 diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index 01d67ba..1a08b81 100644
+index 1ffc23b..e77f81b 100644
 --- a/include/linux/i2c-id.h
 +++ b/include/linux/i2c-id.h
-@@ -110,6 +110,7 @@
- #define I2C_HW_B_INTELFB	0x010021 /* intel framebuffer driver */
+@@ -87,6 +87,7 @@
+ #define I2C_HW_B_CX2341X	0x010020 /* Conexant CX2341X MPEG encoder cards */
  #define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
  #define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
 +#define I2C_HW_B_HDPVR		0x010024 /* Hauppauge HD PVR */
  
- /* --- PCF 8584 based algorithms					*/
- #define I2C_HW_P_ELEK		0x020002 /* Elektor ISA Bus inteface card */
+ /* --- SGI adapters							*/
+ #define I2C_HW_SGI_VINO		0x160000

linux-2.6-selinux-mprotect-checks.patch:

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-selinux-mprotect-checks.patch	25 Sep 2008 18:17:39 -0000	1.7
+++ linux-2.6-selinux-mprotect-checks.patch	29 Jan 2009 21:14:11 -0000	1.8
@@ -7,17 +7,17 @@
 
 --- linux-2.6.26.noarch/security/selinux/hooks.c~	2008-09-25 14:11:17.000000000 -0400
 +++ linux-2.6.26.noarch/security/selinux/hooks.c	2008-09-25 14:12:17.000000000 -0400
-@@ -2962,7 +2962,6 @@ static int selinux_file_ioctl(struct fil
+@@ -3018,7 +3018,6 @@ static int file_map_prot_check(struct fi
+ 	const struct cred *cred = current_cred();
+ 	int rc = 0;
  
- static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
- {
 -#ifndef CONFIG_PPC32
  	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
  		/*
  		 * We are making executable an anonymous mapping or a
-@@ -2973,7 +2972,6 @@ static int file_map_prot_check(struct fi
+@@ -3029,7 +3028,6 @@ static int file_map_prot_check(struct fi
  		if (rc)
- 			return rc;
+ 			goto error;
  	}
 -#endif
  

linux-2.6-sparc-selinux-mprotect-checks.patch:

Index: linux-2.6-sparc-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-sparc-selinux-mprotect-checks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sparc-selinux-mprotect-checks.patch	23 Mar 2008 21:30:40 -0000	1.1
+++ linux-2.6-sparc-selinux-mprotect-checks.patch	29 Jan 2009 21:14:11 -0000	1.2
@@ -1,23 +1,23 @@
 diff -up linux-2.6.24.sparc64/security/selinux/hooks.c.BAD linux-2.6.24.sparc64/security/selinux/hooks.c
 --- linux-2.6.24.sparc64/security/selinux/hooks.c.BAD	2008-03-21 14:28:06.000000000 -0400
 +++ linux-2.6.24.sparc64/security/selinux/hooks.c	2008-03-21 14:29:10.000000000 -0400
-@@ -2825,6 +2825,7 @@ static int selinux_file_ioctl(struct fil
+@@ -3018,6 +3018,7 @@ static int file_map_prot_check(struct fi
+ 	const struct cred *cred = current_cred();
+ 	int rc = 0;
  
- static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
- {
 +#ifndef CONFIG_SPARC
  	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
  		/*
  		 * We are making executable an anonymous mapping or a
-@@ -2835,6 +2836,7 @@ static int file_map_prot_check(struct fi
+@@ -3028,6 +3029,7 @@ static int file_map_prot_check(struct fi
  		if (rc)
- 			return rc;
+ 			goto error;
  	}
 +#endif
  
  	if (file) {
  		/* read access is always possible with a mapping */
-@@ -2885,6 +2887,7 @@ static int selinux_file_mprotect(struct 
+@@ -3081,6 +3081,7 @@ static int selinux_file_mprotect(struct 
  	if (selinux_checkreqprot)
  		prot = reqprot;
  
@@ -25,7 +25,7 @@
  	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
  		rc = 0;
  		if (vma->vm_start >= vma->vm_mm->start_brk &&
-@@ -2909,6 +2912,7 @@ static int selinux_file_mprotect(struct 
+@@ -3103,6 +3103,7 @@ static int selinux_file_mprotect(struct 
  		if (rc)
  			return rc;
  	}

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-utrace.patch,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- linux-2.6-utrace.patch	12 Jan 2009 20:11:43 -0000	1.105
+++ linux-2.6-utrace.patch	29 Jan 2009 21:14:11 -0000	1.106
@@ -7,17 +7,17 @@
  include/linux/utrace.h            |  707 ++++++++++
  init/Kconfig                      |   26 +
  kernel/Makefile                   |    1 +
- kernel/ptrace.c                   |  793 +++++++++++-
+ kernel/ptrace.c                   |  791 +++++++++++-
  kernel/signal.c                   |   14 +-
  kernel/utrace.c                   | 2590 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4790 insertions(+), 12 deletions(-)
+ 12 files changed, 4789 insertions(+), 11 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 9b1f6ca..1fd3feb 100644  
+index 0a08126..7570189 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
 @@ -9,7 +9,7 @@
- DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
+ DOCBOOKS := z8530book.xml mcabook.xml \
  	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
 -	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
@@ -603,7 +603,7 @@
 +
 +</book>
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 6af7fba..9b6902a 100644  
+index 7e4877d..0c683ed 100644  
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
 @@ -81,6 +81,7 @@
@@ -614,9 +614,9 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-@@ -185,6 +186,8 @@ static inline void task_state(struct seq
- 		p->uid, p->euid, p->suid, p->fsuid,
- 		p->gid, p->egid, p->sgid, p->fsgid);
+@@ -187,6 +188,8 @@ static inline void task_state(struct seq
+ 		cred->uid, cred->euid, cred->suid, cred->fsuid,
+ 		cred->gid, cred->egid, cred->sgid, cred->fsgid);
  
 +	task_utrace_proc_status(m, p);
 +
@@ -624,10 +624,10 @@
  	if (p->files)
  		fdt = files_fdtable(p->files);
 diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
-index 22641d5..91b3412 100644  
+index 98b93ca..9b0d5be 100644  
 --- a/include/linux/ptrace.h
 +++ b/include/linux/ptrace.h
-@@ -120,6 +120,7 @@ static inline void ptrace_unlink(struct 
+@@ -121,6 +121,7 @@ static inline void ptrace_unlink(struct 
  int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data);
  int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data);
  
@@ -635,7 +635,7 @@
  /**
   * task_ptrace - return %PT_* flags that apply to a task
   * @task:	pointer to &task_struct in question
-@@ -153,6 +154,26 @@ static inline int ptrace_event(int mask,
+@@ -154,6 +155,26 @@ static inline int ptrace_event(int mask,
  	return 1;
  }
  
@@ -663,10 +663,10 @@
   * ptrace_init_task - initialize ptrace state for a new child
   * @child:		new child task
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 55e30d1..b82b5f4 100644  
+index 4cae9b8..ca0861e 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1243,6 +1243,11 @@ struct task_struct {
+@@ -1266,6 +1266,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -678,7 +678,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1829,6 +1834,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1865,6 +1870,7 @@ extern int kill_pgrp(struct pid *pid, in
  extern int kill_pid(struct pid *pid, int sig, int priv);
  extern int kill_proc_info(int, struct siginfo *, pid_t);
  extern int do_notify_parent(struct task_struct *, int);
@@ -1633,10 +1633,10 @@
 +
 +#endif	/* linux/utrace.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index f763762..df75f9c 100644  
+index e7893b1..6a5bcbc 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -923,6 +923,32 @@ config STOP_MACHINE
+@@ -940,6 +940,32 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1670,7 +1670,7 @@
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 19fad00..16a30b0 100644  
+index 2921d90..16df880 100644  
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -64,6 +64,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
@@ -1682,7 +1682,7 @@
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
  obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 4c8bcd7..8d19d04 100644  
+index 29dc700..70e94e2 100644  
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1693,7 +1693,7 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/audit.h>
-@@ -38,6 +39,7 @@ void __ptrace_link(struct task_struct *c
+@@ -49,6 +50,7 @@ void __ptrace_link(struct task_struct *c
  	child->parent = new_parent;
  }
   
@@ -1701,7 +1701,7 @@
  /*
   * Turn a tracing stop into a normal stop now, since with no tracer there
   * would be no way to wake it up with SIGCONT or SIGKILL.  If there was a
-@@ -58,6 +60,72 @@ static void ptrace_untrace(struct task_s
+@@ -69,6 +71,72 @@ static void ptrace_untrace(struct task_s
  	spin_unlock(&child->sighand->siglock);
  }
  
@@ -1774,10 +1774,10 @@
  /*
   * unptrace a task: move it back to its original parent and
   * remove it from the ptrace list.
-@@ -72,10 +140,11 @@ void __ptrace_unlink(struct task_struct 
- 	child->parent = child->real_parent;
+@@ -84,10 +152,11 @@ void __ptrace_unlink(struct task_struct 
  	list_del_init(&child->ptrace_entry);
  
+ 	arch_ptrace_untrace(child);
 -	if (task_is_traced(child))
 -		ptrace_untrace(child);
 +	ptrace_finish(child);
@@ -1788,7 +1788,7 @@
  /*
   * Check that we have indeed attached to the thing..
   */
-@@ -113,6 +182,536 @@ int ptrace_check_attach(struct task_stru
+@@ -125,6 +194,536 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
  
@@ -2143,7 +2143,7 @@
 +		info->si_errno = 0;
 +		info->si_code = SI_USER;
 +		info->si_pid = task_pid_vnr(task->parent);
-+		info->si_uid = task->parent->uid;
++		info->si_uid = __task_cred(task->parent)->uid;
 +	}
 +
 +	task->exit_code = 0;
@@ -2179,7 +2179,7 @@
 +			info->si_signo = SIGTRAP;
 +			info->si_code = SIGTRAP;
 +			info->si_pid = task_pid_vnr(task);
-+			info->si_uid = task->uid;
++			info->si_uid = __task_cred(task->parent)->uid;
 +			break;
 +		}
 +		/* Fall through.  */
@@ -2324,8 +2324,8 @@
 +
  int __ptrace_may_access(struct task_struct *task, unsigned int mode)
  {
- 	/* May we inspect the given task?
-@@ -156,12 +755,17 @@ int ptrace_attach(struct task_struct *ta
+ 	const struct cred *cred = current_cred(), *tcred;
+@@ -176,12 +775,17 @@ int ptrace_attach(struct task_struct *ta
  {
  	int retval;
  	unsigned long flags;
@@ -2342,20 +2342,18 @@
 +	if (unlikely(IS_ERR(engine)))
 +		return PTR_ERR(engine);
  
- repeat:
- 	/*
-@@ -202,8 +806,8 @@ repeat:
- bad:
- 	write_unlock_irqrestore(&tasklist_lock, flags);
+ 	/* Protect exec's credential calculations against our interference;
+ 	 * SUID, SGID and LSM creds get determined differently under ptrace.
+@@ -232,7 +836,7 @@ bad:
  	task_unlock(task);
--out:
+ 	mutex_unlock(&current->cred_exec_mutex);
+ out:
 -	return retval;
-+
 +	return finish_ptrace_attach(task, engine, retval);
  }
  
  static inline void __ptrace_detach(struct task_struct *child, unsigned int data)
-@@ -221,9 +825,7 @@ int ptrace_detach(struct task_struct *ch
+@@ -250,9 +854,7 @@ int ptrace_detach(struct task_struct *ch
  	if (!valid_signal(data))
  		return -EIO;
  
@@ -2366,7 +2364,7 @@
  
  	write_lock_irq(&tasklist_lock);
  	/* protect against de_thread()->release_task() */
-@@ -309,6 +911,8 @@ static int ptrace_setoptions(struct task
+@@ -338,6 +940,8 @@ static int ptrace_setoptions(struct task
  	if (data & PTRACE_O_TRACEEXIT)
  		child->ptrace |= PT_TRACE_EXIT;
  
@@ -2375,7 +2373,7 @@
  	return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
  }
  
-@@ -367,6 +971,7 @@ static int ptrace_setsiginfo(struct task
+@@ -396,6 +1000,7 @@ static int ptrace_setsiginfo(struct task
  #define is_sysemu_singlestep(request)	0
  #endif
  
@@ -2383,7 +2381,7 @@
  static int ptrace_resume(struct task_struct *child, long request, long data)
  {
  	if (!valid_signal(data))
-@@ -401,6 +1006,170 @@ static int ptrace_resume(struct task_str
+@@ -430,6 +1035,170 @@ static int ptrace_resume(struct task_str
  
  	return 0;
  }
@@ -2554,7 +2552,7 @@
  
  int ptrace_request(struct task_struct *child, long request,
  		   long addr, long data)
-@@ -480,6 +1249,11 @@ int ptrace_request(struct task_struct *c
+@@ -509,6 +1278,11 @@ int ptrace_request(struct task_struct *c
  int ptrace_traceme(void)
  {
  	int ret = -EPERM;
@@ -2566,7 +2564,7 @@
  
  	/*
  	 * Are we already being traced?
-@@ -513,7 +1287,8 @@ repeat:
+@@ -542,7 +1316,8 @@ repeat:
  		write_unlock_irqrestore(&tasklist_lock, flags);
  	}
  	task_unlock(current);
@@ -2577,10 +2575,10 @@
  
  /**
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 4530fc6..0e85826 100644  
+index 3152ac3..f431662 100644  
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
-@@ -1419,7 +1419,7 @@ int do_notify_parent(struct task_struct 
+@@ -1441,7 +1441,7 @@ int do_notify_parent(struct task_struct 
  	return ret;
  }
  
@@ -2589,7 +2587,7 @@
  {
  	struct siginfo info;
  	unsigned long flags;
-@@ -1474,6 +1474,8 @@ static void do_notify_parent_cldstop(str
+@@ -1495,6 +1495,8 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2598,7 +2596,7 @@
  static inline int may_ptrace_stop(void)
  {
  	if (!likely(current->ptrace & PT_PTRACED))
-@@ -1606,6 +1608,8 @@ void ptrace_notify(int exit_code)
+@@ -1627,6 +1629,8 @@ void ptrace_notify(int exit_code)
  	spin_unlock_irq(&current->sighand->siglock);
  }
  
@@ -2607,7 +2605,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1683,6 +1687,7 @@ static int do_signal_stop(int signr)
+@@ -1704,6 +1708,7 @@ static int do_signal_stop(int signr)
  	return 1;
  }
  
@@ -2615,7 +2613,7 @@
  static int ptrace_signal(int signr, siginfo_t *info,
  			 struct pt_regs *regs, void *cookie)
  {
-@@ -1721,6 +1726,13 @@ static int ptrace_signal(int signr, sigi
+@@ -1742,6 +1747,13 @@ static int ptrace_signal(int signr, sigi
  
  	return signr;
  }


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.928
retrieving revision 1.929
diff -u -r1.928 -r1.929
--- sources	26 Jan 2009 21:11:19 -0000	1.928
+++ sources	29 Jan 2009 21:14:12 -0000	1.929
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-3a04439a0507847b45809b267c4db81b  patch-2.6.28.2.bz2
+d95a5be60287e9632c9d0513b59f6511  patch-2.6.29-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -r1.839 -r1.840
--- upstream	26 Jan 2009 21:11:20 -0000	1.839
+++ upstream	29 Jan 2009 21:14:12 -0000	1.840
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28.2.bz2
+patch-2.6.29-rc3.bz2


--- disable-p4-cpufreq-ui.patch DELETED ---


--- iwlwifi-intel-bug-1822.patch DELETED ---


--- linux-2.6-net-silence-noisy-printks.patch DELETED ---


--- linux-2.6-olpc-speaker-out.patch DELETED ---


--- linux-2.6-piix3-silence-quirk.patch DELETED ---


--- linux-2.6-rtl8187b-tx-status-feedback.patch DELETED ---


--- linux-2.6-selinux-move-open-perms-check.patch DELETED ---


--- linux-2.6-serial.patch DELETED ---


--- linux-2.6-squashfs.patch DELETED ---


--- linux-2.6.27-pci-hush-allocation-failures.patch DELETED ---


--- patch-2.6.28.2.bz2.sign DELETED ---


--- skip-sanity-check-of-busy-resources.patch DELETED ---


