Thu Feb 19 20:28:47 UTC 2009

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5304

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore config-generic kernel.spec 
	linux-2.6-crash-driver.patch linux-2.6-ext4-ENOSPC-debug.patch 
	sources upstream xen.pvops.patch xen.pvops.post.patch 
	xen.pvops.pre.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	drm-i915-resume-force-mode.patch drm-intel-suspend.patch 
	drm-modesetting-radeon-pciid.patch 
	patch-2.6.29-rc5-git3.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	linux-2.6-ext4-write-cyclic-fix.patch 
	linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch 
	linux-2.6-iommu-write-buf.patch 
	linux-2.6-kvmclock-unsync-tsc-workaround.patch 
	patch-2.6.29-rc4-git7.bz2.sign patch-2.6.29-rc4.bz2.sign 
Log Message:
Update pvops patch which includes a fix to a major apic bug


drm-i915-resume-force-mode.patch:

--- NEW FILE drm-i915-resume-force-mode.patch ---
http://lists.freedesktop.org/archives/intel-gfx/2009-February/001313.html

--- a/drivers/gpu/drm/i915/i915_suspend.c.orig	2009-02-18 22:59:19.000000000 -0500
+++ b/drivers/gpu/drm/i915/i915_suspend.c	2009-02-18 22:59:58.000000000 -0500
@@ -28,6 +28,7 @@
 #include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
+#include <drm/drm_crtc_helper.h>
 
 static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
 {
@@ -519,6 +520,8 @@
 
 	i915_restore_vga(dev);
 
+	drm_helper_resume_force_mode(dev);
+
 	return 0;
 }
 

drm-intel-suspend.patch:

--- NEW FILE drm-intel-suspend.patch ---
Subject: [Intel-gfx] [PATCH] i915: suspend/resume GEM when KMS is active
From: Jesse Barnes <jbarnes at virtuousgeek.org> 

On Tuesday, February 17, 2009 3:13 pm Jesse Barnes wrote:
> In the KMS case, we need to suspend/resume GEM as well.  So on suspend,
> make sure we idle GEM and stop any new rendering from coming in, and on
> resume, re-init the framebuffer and clear the suspended flag.
>
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

Oops should have included the IRQ bits as well.  We need to do this t
properly tear down vblank state and make sure no interrupts come in
either after suspend or before resume while the machine is still running.

Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index a31cbdb..139a0d8 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -27,6 +27,7 @@
  *
  */
 
+#include <linux/device.h>
 #include "drmP.h"
 #include "drm.h"
 #include "i915_drm.h"
@@ -64,6 +65,15 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
 
 	pci_save_state(dev->pdev);
 
+	/* If KMS is active, we do the leavevt stuff here */
+	if (drm_core_check_feature(dev, DRIVER_MODESET) && i915_gem_idle(dev)) {
+		dev_err(&dev->pdev->dev, "GEM idle failed, aborting suspend\n");
+		return -EBUSY;
+	}
+
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		drm_irq_uninstall(dev);
+
 	i915_save_state(dev);
 
 	intel_opregion_free(dev);
@@ -79,6 +89,9 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
 
 static int i915_resume(struct drm_device *dev)
 {
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	int ret = 0;
+
 	pci_set_power_state(dev->pdev, PCI_D0);
 	pci_restore_state(dev->pdev);
 	if (pci_enable_device(dev->pdev))
@@ -89,7 +102,19 @@ static int i915_resume(struct drm_device *dev)
 
 	intel_opregion_init(dev);
 
-	return 0;
+	/* KMS EnterVT equivalent */
+	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+		mutex_lock(&dev->struct_mutex);
+		dev_priv->mm.suspended = 0;
+
+		ret = i915_gem_init_ringbuffer(dev);
+		if (ret != 0)
+			ret = -1;
+		mutex_unlock(&dev->struct_mutex);
+		drm_irq_install(dev);
+	}
+
+	return ret;
 }
 
 static struct vm_operations_struct i915_gem_vm_ops = {
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a8d3256..2461d9b 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -621,6 +621,7 @@ int i915_gem_init_ringbuffer(struct drm_device *dev);
 void i915_gem_cleanup_ringbuffer(struct drm_device *dev);
 int i915_gem_do_init(struct drm_device *dev, unsigned long start,
 		     unsigned long end);
+int i915_gem_idle(struct drm_device *dev);
 int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
 int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj,
 				      int write);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index ac534c9..cd5101c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2967,7 +2967,7 @@ i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head)
 	return 0;
 }
 
-static int
+int
 i915_gem_idle(struct drm_device *dev)
 {
 	drm_i915_private_t *dev_priv = dev->dev_private;

drm-modesetting-radeon-pciid.patch:

--- NEW FILE drm-modesetting-radeon-pciid.patch ---
diff -up linux-2.6.28.noarch/drivers/gpu/drm/radeon/radeon_drv.c.dma linux-2.6.28.noarch/drivers/gpu/drm/radeon/radeon_drv.c
--- linux-2.6.28.noarch/drivers/gpu/drm/radeon/radeon_drv.c.dma	2009-02-19 18:19:48.000000000 +1000
+++ linux-2.6.28.noarch/drivers/gpu/drm/radeon/radeon_drv.c	2009-02-19 18:20:49.000000000 +1000
@@ -84,6 +84,10 @@ static struct pci_device_id pciidlist[] 
 	radeon_PCI_IDS
 };
 
+#if defined(CONFIG_DRM_RADEON_KMS)
+MODULE_DEVICE_TABLE(pci, pciidlist);
+#endif
+
 extern struct drm_fence_driver radeon_fence_driver;
 
 static uint32_t radeon_mem_prios[] = {DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};


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

iD8DBQBJnUo7yGugalF9Dw4RAlG4AJ9Dz83GAQHvuHwiKi4LunYP+kazHwCbBRFk
Yd3sFZofZ6CLVU/2JzLtmbg=
=cBFe
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014
retrieving revision 1.1014.2.1
diff -u -r1.1014 -r1.1014.2.1
--- .cvsignore	13 Feb 2009 19:10:25 -0000	1.1014
+++ .cvsignore	19 Feb 2009 20:28:14 -0000	1.1014.2.1
@@ -4,5 +4,5 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.29-rc4.bz2
-patch-2.6.29-rc4-git7.bz2
+patch-2.6.29-rc5.bz2
+patch-2.6.29-rc5-git3.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.1
retrieving revision 1.238.6.2
diff -u -r1.238.6.1 -r1.238.6.2
--- config-generic	17 Feb 2009 22:10:50 -0000	1.238.6.1
+++ config-generic	19 Feb 2009 20:28:14 -0000	1.238.6.2
@@ -974,8 +974,8 @@
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
+CONFIG_SCTP_HMAC_SHA1=y
+# CONFIG_SCTP_HMAC_MD5 is not set
 CONFIG_ATM=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
@@ -2459,9 +2459,9 @@
 CONFIG_FB_I810_I2C=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_IMAC is not set
-CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL is not set
 # CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
+# CONFIG_FB_INTEL_I2C is not set
 CONFIG_FB_KYRO=m
 # CONFIG_FB_LE80578 is not set
 CONFIG_FB_MATROX=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.1
retrieving revision 1.1294.2.2
diff -u -r1.1294.2.1 -r1.1294.2.2
--- kernel.spec	17 Feb 2009 22:10:51 -0000	1.1294.2.1
+++ kernel.spec	19 Feb 2009 20:28:14 -0000	1.1294.2.2
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -96,7 +96,7 @@
 
 # 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
+%define with_doc 0
 %if 0%{?released_kernel}
 %define doc_build_fail false
 %else
@@ -582,8 +582,6 @@
 # Git trees.
 Patch10: git-cpufreq.patch
 
-Patch15: linux-2.6-iommu-write-buf.patch
-
 # Standalone patches
 Patch20: linux-2.6-hotfixes.patch
 
@@ -613,7 +611,6 @@
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch392: linux-2.6-acpi-strict-resources.patch
 Patch393: linux-2.6-hwmon-atk0110.patch
-Patch394: linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
@@ -622,7 +619,6 @@
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 
-Patch590: linux-2.6-ext4-write-cyclic-fix.patch
 Patch591: linux-2.6-ext4-ENOSPC-debug.patch
 
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
@@ -646,6 +642,9 @@
 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
@@ -653,9 +652,6 @@
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
-# kvmclock is broken with unsync TSC (#475598)
-Patch2040: linux-2.6-kvmclock-unsync-tsc-workaround.patch
-
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
@@ -1018,8 +1014,6 @@
 
 ApplyPatch linux-2.6-hotfixes.patch
 
-ApplyPatch linux-2.6-iommu-write-buf.patch
-
 # Roland's utrace ptrace replacement.
 ApplyPatch linux-2.6-utrace.patch
 
@@ -1061,7 +1055,6 @@
 #
 
 # ext4
-ApplyPatch linux-2.6-ext4-write-cyclic-fix.patch
 ApplyPatch linux-2.6-ext4-ENOSPC-debug.patch
 
 # xfs
@@ -1075,7 +1068,6 @@
 ApplyPatch linux-2.6-acpi-video-dos.patch
 ApplyPatch linux-2.6-acpi-strict-resources.patch
 ApplyPatch linux-2.6-hwmon-atk0110.patch
-ApplyPatch linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1152,14 +1144,15 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
-ApplyPatch linux-2.6-kvmclock-unsync-tsc-workaround.patch
-
 # Nouveau DRM + drm fixes
 #ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-nouveau.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
@@ -1759,7 +1752,35 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Mon Feb 16 2009 Michael Young <m.a.young at durham.ac.uk>
+* 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
+
+* Thu Feb 19 2009 Dave Jones <davej at redhat.com> 2.6.29-0.131.rc5.git3
+- 2.6.29-rc5-git3
+
+* Thu Feb 19 2009 Dave Airlie <airlied at redhat.com> 
+- radeon: add module device table
+
+* Wed Feb 18 2009 Kyle McMartin <kyle at redhat.com>
+- i915_suspend: force reset of mode on resume
+
+* Wed Feb 18 2009 Eric Sandeen <sandeen at redhat.com> 2.6.29-0.131.rc5.git2
+- Drop noisy printk from ext4 ENOSPC patch; for now it's a "fix"
+
+* Wed Feb 18 2009 Kristian HÃ¸gsberg <krh at redhat.com>
+- Add drm-intel-suspend.patch to fix suspend/resume with intel KMS.
+
+* Wed Feb 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.128.rc5.git2
+- 2.6.29-rc5-git2
+
+* Wed Feb 18 2009 Neil Horman <nhorman at redhat.com>
+- Update config to turn on SHA1 HMACS in SCTP (bz 485933)
+
+* Tue Feb 17 2009 Adam Jackson <ajax at redhat.com>
+- Death to intelfb
+
+* Tue Feb 17 2009 Michael Young <m.a.young at durham.ac.uk>
 - Add xen pvops patches to allow dom0 support
 - disable linux-2.6-debug-dma-api.patch patch (too tricky to merge)
 - disable linux-2.6-execshield.patch patch (merge issues)

linux-2.6-crash-driver.patch:

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-crash-driver.patch,v
retrieving revision 1.12
retrieving revision 1.12.6.1
diff -u -r1.12 -r1.12.6.1
--- linux-2.6-crash-driver.patch	8 Dec 2008 16:27:32 -0000	1.12
+++ linux-2.6-crash-driver.patch	19 Feb 2009 20:28:14 -0000	1.12.6.1
@@ -118,8 +118,8 @@
  }
 +EXPORT_SYMBOL_GPL(page_is_ram);
  
- int pagerange_is_ram(unsigned long start, unsigned long end)
- {
+ /*
+  * Fix up the linear direct mapping of the kernel to avoid cache attribute
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
 index 43d6ba8..0d81c9a 100644
 --- a/drivers/char/Kconfig

linux-2.6-ext4-ENOSPC-debug.patch:

Index: linux-2.6-ext4-ENOSPC-debug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ext4-ENOSPC-debug.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- linux-2.6-ext4-ENOSPC-debug.patch	17 Feb 2009 22:10:51 -0000	1.1.2.2
+++ linux-2.6-ext4-ENOSPC-debug.patch	19 Feb 2009 20:28:14 -0000	1.1.2.3
@@ -18,20 +18,17 @@
     
     Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
 
+XXX ERS: Remove printk, it's too much noise now, we got the bug reports
+
 diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
 index a200059..21080ab 100644
 --- a/fs/ext4/ialloc.c
 +++ b/fs/ext4/ialloc.c
-@@ -715,6 +715,13 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode)
+@@ -715,6 +715,8 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode)
  
  	if (sbi->s_log_groups_per_flex) {
  		ret2 = find_group_flex(sb, dir, &group);
-+		if (ret2 == -1) {
++		if (ret2 == -1)
 +			ret2 = find_group_other(sb, dir, &group);
-+			if (ret2 == 0)
-+				printk(KERN_NOTICE "ext4: find_group_flex "
-+				       "failed, fallback succeeded dir %lu\n",
-+				       dir->i_ino);
-+		}
  		goto got_group;
  	}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.1
retrieving revision 1.976.2.2
diff -u -r1.976.2.1 -r1.976.2.2
--- sources	17 Feb 2009 22:10:51 -0000	1.976.2.1
+++ sources	19 Feb 2009 20:28:14 -0000	1.976.2.2
@@ -1,2 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 60193569887cb6fe98b9c0d483f911e7  patch-2.6.29-rc5.bz2
+d18e5d821b0eed940ded040d965dc566  patch-2.6.29-rc5-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888
retrieving revision 1.888.2.1
diff -u -r1.888 -r1.888.2.1
--- upstream	13 Feb 2009 19:10:25 -0000	1.888
+++ upstream	19 Feb 2009 20:28:14 -0000	1.888.2.1
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
-patch-2.6.29-rc4.bz2
-patch-2.6.29-rc4-git7.bz2
+patch-2.6.29-rc5.bz2
+patch-2.6.29-rc5-git3.bz2

xen.pvops.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1.2.1 -r 1.1.2.2 xen.pvops.patch
Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- xen.pvops.patch	17 Feb 2009 22:10:51 -0000	1.1.2.1
+++ xen.pvops.patch	19 Feb 2009 20:28:15 -0000	1.1.2.2
@@ -1,3 +1,15 @@
+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
@@ -75,6 +87,35 @@
 +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
@@ -186,6 +227,132 @@
  dynamic ftrace
  --------------
  
+diff --git a/Documentation/hwmon/hpfall.c b/Documentation/hwmon/hpfall.c
+deleted file mode 100644
+index bbea1cc..0000000
+--- a/Documentation/hwmon/hpfall.c
++++ /dev/null
+@@ -1,101 +0,0 @@
+-/* Disk protection for HP machines.
+- *
+- * Copyright 2008 Eric Piel
+- * Copyright 2009 Pavel Machek <pavel at suse.cz>
+- *
+- * GPLv2.
+- */
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <unistd.h>
+-#include <fcntl.h>
+-#include <sys/stat.h>
+-#include <sys/types.h>
+-#include <string.h>
+-#include <stdint.h>
+-#include <errno.h>
+-#include <signal.h>
+-
+-void write_int(char *path, int i)
+-{
+-	char buf[1024];
+-	int fd = open(path, O_RDWR);
+-	if (fd < 0) {
+-		perror("open");
+-		exit(1);
+-	}
+-	sprintf(buf, "%d", i);
+-	if (write(fd, buf, strlen(buf)) != strlen(buf)) {
+-		perror("write");
+-		exit(1);
+-	}
+-	close(fd);
+-}
+-
+-void set_led(int on)
+-{
+-	write_int("/sys/class/leds/hp::hddprotect/brightness", on);
+-}
+-
+-void protect(int seconds)
+-{
+-	write_int("/sys/block/sda/device/unload_heads", seconds*1000);
+-}
+-
+-int on_ac(void)
+-{
+-//	/sys/class/power_supply/AC0/online
+-}
+-
+-int lid_open(void)
+-{
+-//	/proc/acpi/button/lid/LID/state
+-}
+-
+-void ignore_me(void)
+-{
+-	protect(0);
+-	set_led(0);
+-
+-}
+-
+-int main(int argc, char* argv[])
+-{
+-       int fd, ret;
+-
+-       fd = open("/dev/freefall", O_RDONLY);
+-       if (fd < 0) {
+-               perror("open");
+-               return EXIT_FAILURE;
+-       }
+-
+-	signal(SIGALRM, ignore_me);
+-
+-       for (;;) {
+-	       unsigned char count;
+-
+-               ret = read(fd, &count, sizeof(count));
+-	       alarm(0);
+-	       if ((ret == -1) && (errno == EINTR)) {
+-		       /* Alarm expired, time to unpark the heads */
+-		       continue;
+-	       }
+-
+-               if (ret != sizeof(count)) {
+-                       perror("read");
+-                       break;
+-               }
+-
+-	       protect(21);
+-	       set_led(1);
+-	       if (1 || on_ac() || lid_open()) {
+-		       alarm(2);
+-	       } else {
+-		       alarm(20);
+-	       }
+-       }
+-
+-       close(fd);
+-       return EXIT_SUCCESS;
+-}
+diff --git a/Documentation/hwmon/lis3lv02d b/Documentation/hwmon/lis3lv02d
+index 287f8c9..0fcfc4a 100644
+--- a/Documentation/hwmon/lis3lv02d
++++ b/Documentation/hwmon/lis3lv02d
+@@ -33,14 +33,6 @@ rate - reports the sampling rate of the accelerometer device in HZ
+ This driver also provides an absolute input class device, allowing
+ the laptop to act as a pinball machine-esque joystick.
+ 
+-Another feature of the driver is misc device called "freefall" that
+-acts similar to /dev/rtc and reacts on free-fall interrupts received
+-from the device. It supports blocking operations, poll/select and
+-fasync operation modes. You must read 1 bytes from the device.  The
+-result is number of free-fall interrupts since the last successful
+-read (or 255 if number of interrupts would not fit).
+-
+-
+ Axes orientation
+ ----------------
+ 
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
 index b182626..fc22e92 100644
 --- a/Documentation/kernel-parameters.txt
@@ -587,25 +754,6 @@
  '0'-'9' - Sets the console log level, controlling which kernel messages
            will be printed to your console. ('0', for example would make
            it so that only emergency messages like PANICs or OOPSes would
-diff --git a/Documentation/tracers/mmiotrace.txt b/Documentation/tracers/mmiotrace.txt
-index cde23b4..5731c67 100644
---- a/Documentation/tracers/mmiotrace.txt
[...49323 lines suppressed...]
+ 	if (!event) {
+ 		atomic_inc(&dropped_count);
  		return;
-+	}
+ 	}
  	entry	= ring_buffer_event_data(event);
 -	tracing_generic_entry_update(&entry->ent, 0, preempt_count());
 -	entry->ent.type			= TRACE_MMIO_MAP;
@@ -79683,26 +99964,6 @@
 +	if (!s->ctor && !(s->flags & SLAB_DESTROY_BY_RCU))
 +		kmemcheck_mark_freed(object, size);
 +}
-diff --git a/mm/memory.c b/mm/memory.c
-index baa999e..b80cc31 100644
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1718,6 +1718,7 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd,
- 
- 	BUG_ON(pmd_huge(*pmd));
- 
-+	preempt_disable();
- 	arch_enter_lazy_mmu_mode();
- 
- 	token = pmd_pgtable(*pmd);
-@@ -1729,6 +1730,7 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd,
- 	} while (pte++, addr += PAGE_SIZE, addr != end);
- 
- 	arch_leave_lazy_mmu_mode();
-+	preempt_enable();
- 
- 	if (mm != &init_mm)
- 		pte_unmap_unlock(pte-1, ptl);
 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
 index 3eb4a6f..636344d 100644
 --- a/mm/mempolicy.c
@@ -79716,33 +99977,53 @@
  	}
  }
  
-diff --git a/mm/mlock.c b/mm/mlock.c
-index 037161d..cbe9e05 100644
---- a/mm/mlock.c
-+++ b/mm/mlock.c
-@@ -660,7 +660,7 @@ void *alloc_locked_buffer(size_t size)
- 	return buffer;
- }
- 
--void free_locked_buffer(void *buffer, size_t size)
-+void release_locked_buffer(void *buffer, size_t size)
+diff --git a/mm/page-writeback.c b/mm/page-writeback.c
+index 74dc57c..3c84128 100644
+--- a/mm/page-writeback.c
++++ b/mm/page-writeback.c
+@@ -240,7 +240,7 @@ void bdi_writeout_inc(struct backing_dev_info *bdi)
+ }
+ EXPORT_SYMBOL_GPL(bdi_writeout_inc);
+ 
+-void task_dirty_inc(struct task_struct *tsk)
++static inline void task_dirty_inc(struct task_struct *tsk)
+ {
+ 	prop_inc_single(&vm_dirties, &tsk->dirties);
+ }
+@@ -1230,7 +1230,6 @@ int __set_page_dirty_nobuffers(struct page *page)
+ 				__inc_zone_page_state(page, NR_FILE_DIRTY);
+ 				__inc_bdi_stat(mapping->backing_dev_info,
+ 						BDI_RECLAIMABLE);
+-				task_dirty_inc(current);
+ 				task_io_account_write(PAGE_CACHE_SIZE);
+ 			}
+ 			radix_tree_tag_set(&mapping->page_tree,
+@@ -1263,7 +1262,7 @@ EXPORT_SYMBOL(redirty_page_for_writepage);
+  * If the mapping doesn't provide a set_page_dirty a_op, then
+  * just fall through and assume that it wants buffer_heads.
+  */
+-int set_page_dirty(struct page *page)
++static int __set_page_dirty(struct page *page)
  {
- 	unsigned long pgsz = PAGE_ALIGN(size) >> PAGE_SHIFT;
+ 	struct address_space *mapping = page_mapping(page);
  
-@@ -670,6 +670,11 @@ void free_locked_buffer(void *buffer, size_t size)
- 	current->mm->locked_vm -= pgsz;
- 
- 	up_write(&current->mm->mmap_sem);
-+}
+@@ -1281,6 +1280,14 @@ int set_page_dirty(struct page *page)
+ 	}
+ 	return 0;
+ }
 +
-+void free_locked_buffer(void *buffer, size_t size)
++int set_page_dirty(struct page *page)
 +{
-+	release_locked_buffer(buffer, size);
++	int ret = __set_page_dirty(page);
++	if (ret)
++		task_dirty_inc(current);
++	return ret;
++}
+ EXPORT_SYMBOL(set_page_dirty);
  
- 	kfree(buffer);
- }
+ /*
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 5675b30..28dd4e5 100644
+index 5c44ed4..28dd4e5 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
 @@ -554,6 +554,13 @@ static void __free_pages_ok(struct page *page, unsigned int order)
@@ -79798,6 +100079,63 @@
  	p->flags &= ~PF_MEMALLOC;
  
  	cond_resched();
+@@ -2989,7 +3008,7 @@ static int __meminit next_active_region_index_in_nid(int index, int nid)
+  * was used and there are no special requirements, this is a convenient
+  * alternative
+  */
+-int __meminit __early_pfn_to_nid(unsigned long pfn)
++int __meminit early_pfn_to_nid(unsigned long pfn)
+ {
+ 	int i;
+ 
+@@ -3000,33 +3019,10 @@ int __meminit __early_pfn_to_nid(unsigned long pfn)
+ 		if (start_pfn <= pfn && pfn < end_pfn)
+ 			return early_node_map[i].nid;
+ 	}
+-	/* This is a memory hole */
+-	return -1;
+-}
+-#endif /* CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID */
+-
+-int __meminit early_pfn_to_nid(unsigned long pfn)
+-{
+-	int nid;
+ 
+-	nid = __early_pfn_to_nid(pfn);
+-	if (nid >= 0)
+-		return nid;
+-	/* just returns 0 */
+ 	return 0;
+ }
+-
+-#ifdef CONFIG_NODES_SPAN_OTHER_NODES
+-bool __meminit early_pfn_in_nid(unsigned long pfn, int node)
+-{
+-	int nid;
+-
+-	nid = __early_pfn_to_nid(pfn);
+-	if (nid >= 0 && nid != node)
+-		return false;
+-	return true;
+-}
+-#endif
++#endif /* CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID */
+ 
+ /* Basic iterator support to walk early_node_map[] */
+ #define for_each_active_range_index_in_nid(i, nid) \
+diff --git a/mm/page_io.c b/mm/page_io.c
+index 3023c47..dc6ce0a 100644
+--- a/mm/page_io.c
++++ b/mm/page_io.c
+@@ -111,7 +111,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
+ 		goto out;
+ 	}
+ 	if (wbc->sync_mode == WB_SYNC_ALL)
+-		rw |= (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG);
++		rw |= (1 << BIO_RW_SYNC);
+ 	count_vm_event(PSWPOUT);
+ 	set_page_writeback(page);
+ 	unlock_page(page);
 diff --git a/mm/slab.c b/mm/slab.c
 index 4d00855..960eec8 100644
 --- a/mm/slab.c
@@ -80500,6 +100838,25 @@
  	unsigned long maxpages = 1;
  	unsigned long swapfilepages;
  	unsigned short *swap_map = NULL;
+diff --git a/mm/vmalloc.c b/mm/vmalloc.c
+index 4dd2636..75f49d3 100644
+--- a/mm/vmalloc.c
++++ 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
 --- a/mm/vmscan.c

xen.pvops.post.patch:

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- xen.pvops.post.patch	17 Feb 2009 22:10:51 -0000	1.1.2.1
+++ xen.pvops.post.patch	19 Feb 2009 20:28:15 -0000	1.1.2.2
@@ -1,16 +1,6 @@
 Reapply and merge in Fedora changes
 remove localversion-tip file to avoid -tip being added to the kernel name
 
---- a/arch/x86/mm/ioremap.c	2009-02-14 09:16:34.000000000 +0000
-+++ b/arch/x86/mm/ioremap.c	2009-02-14 12:49:11.000000000 +0000
-@@ -133,6 +133,7 @@
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(page_is_ram);
- 
- /*
-  * Fix up the linear direct mapping of the kernel to avoid cache attribute
 --- a/arch/x86/mm/pat.c	2009-02-14 09:16:34.000000000 +0000
 +++ b/arch/x86/mm/pat.c	2009-02-14 12:49:46.000000000 +0000
 @@ -29,6 +30,7 @@
@@ -21,17 +11,17 @@
  
  void __cpuinit pat_disable(const char *reason)
  {
---- a/drivers/pci/intel-iommu.c	2009-02-17 19:31:17.000000000 +0000
-+++ b/drivers/pci/intel-iommu.c	2009-02-17 19:57:58.000000000 +0000
-@@ -61,7 +61,7 @@
- /* global iommu list, set NULL for ignored DMAR units */
- static struct intel_iommu **g_iommus;
- 
--static int rwbf_quirk;
-+static int rwbf_quirk = 0;
-
- /*
-  * 0: Present
+--- a/arch/x86/kernel/apic/nmi.c	2009-02-17 20:51:37.000000000 +0000
++++ b/arch/x86/kernel/apic/nmi.c	2009-02-18 20:51:13.000000000 +0000
+@@ -442,7 +442,7 @@
+ 		 * wait a few IRQs (5 seconds) before doing the oops ...
+ 		 */
+ 		local_inc(&__get_cpu_var(alert_counter));
+-		if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz)
++		if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz)
+ 			/*
+ 			 * die_nmi will return ONLY if NOTIFY_STOP happens..
+ 			 */
 --- a/localversion-tip	2009-02-17 19:49:34.000000000 +0000
 +++ /dev/null	2009-02-17 18:08:14.005240123 +0000
 @@ -1 +0,0 @@

xen.pvops.pre.patch:

Index: xen.pvops.pre.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.pre.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- xen.pvops.pre.patch	17 Feb 2009 22:10:51 -0000	1.1.2.1
+++ xen.pvops.pre.patch	19 Feb 2009 20:28:15 -0000	1.1.2.2
@@ -1,19 +1,8 @@
 temporarily revert various Fedora changes so that the pvops patch applies cleanly
 Affected patches;
-linux-2.6-crash-driver.patch - arch/x86/mm/ioremap.c
 drm-modesetting-radeon.patch - arch/x86/mm/pat.c
-linux-2.6-iommu-write-buf.patch - drivers/pci/intel-iommu.c (essentially in the pvops patch already)
+linux-2.6-debug-nmi-timeout.patch - arch/x86/kernel/nmi.c (moved to arch/x86/kernel/apic/nmi.c)
 
---- a/arch/x86/mm/ioremap.c	2009-02-14 12:49:11.000000000 +0000
-+++ b/arch/x86/mm/ioremap.c	2009-02-14 09:16:34.000000000 +0000
-@@ -133,7 +133,6 @@
- 	}
- 	return 0;
- }
--EXPORT_SYMBOL_GPL(page_is_ram);
- 
- int pagerange_is_ram(unsigned long start, unsigned long end)
- {
 --- a/arch/x86/mm/pat.c	2009-02-14 12:49:46.000000000 +0000
 +++ b/arch/x86/mm/pat.c	2009-02-14 09:16:34.000000000 +0000
 @@ -30,7 +29,6 @@
@@ -24,37 +13,14 @@
  
  void __cpuinit pat_disable(char *reason)
  {
---- a/drivers/pci/intel-iommu.c	2009-02-17 19:57:58.000000000 +0000
-+++ b/drivers/pci/intel-iommu.c	2009-02-17 19:31:17.000000000 +0000
-@@ -61,8 +61,6 @@
- /* global iommu list, set NULL for ignored DMAR units */
- static struct intel_iommu **g_iommus;
- 
--static int rwbf_quirk = 0;
--
- /*
-  * 0: Present
-  * 1-11: Reserved
-@@ -787,7 +785,7 @@
- 	u32 val;
- 	unsigned long flag;
- 
--	if (!rwbf_quirk && !cap_rwbf(iommu->cap))
-+	if (!cap_rwbf(iommu->cap))
- 		return;
- 	val = iommu->gcmd | DMA_GCMD_WBF;
- 
-@@ -3139,13 +3137,3 @@
- 	.unmap		= intel_iommu_unmap_range,
- 	.iova_to_phys	= intel_iommu_iova_to_phys,
- };
--
--static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
--{
--	/* Mobile 4 Series Chipset neglects to set RWBF capability,
--	   but needs it */
--	printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n");
--	rwbf_quirk = 1;
--}
--
--DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
+--- a/arch/x86/kernel/nmi.c	2009-02-18 20:51:13.000000000 +0000
++++ b/arch/x86/kernel/nmi.c	2009-02-17 20:51:37.000000000 +0000
+@@ -442,7 +442,7 @@
+ 		 * wait a few IRQs (5 seconds) before doing the oops ...
+ 		 */
+ 		local_inc(&__get_cpu_var(alert_counter));
+-		if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz)
++		if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz)
+ 			/*
+ 			 * die_nmi will return ONLY if NOTIFY_STOP happens..
+ 			 */


--- linux-2.6-ext4-write-cyclic-fix.patch DELETED ---


--- linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch DELETED ---


--- linux-2.6-iommu-write-buf.patch DELETED ---


--- linux-2.6-kvmclock-unsync-tsc-workaround.patch DELETED ---


--- patch-2.6.29-rc4-git7.bz2.sign DELETED ---


--- patch-2.6.29-rc4.bz2.sign DELETED ---


