rpms/kernel/F-11 patch-2.6.29.3.bz2.sign, NONE, 1.1 .cvsignore, 1.1042, 1.1043 drm-next.patch, 1.17, 1.18 kernel.spec, 1.1596, 1.1597 linux-2.6-execshield.patch, 1.104, 1.105 linux-2.6-iommu-fixes.patch, 1.1, 1.2 linux-2.6-utrace.patch, 1.109, 1.110 sources, 1.1004, 1.1005 upstream, 1.915, 1.916 drm-intel-g41.patch, 1.1, NONE drm-intel-tiled-front.patch, 1.1, NONE linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch, 1.1, NONE linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch, 1.1, NONE patch-2.6.29.2.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Sat May 9 02:08:58 UTC 2009
- Previous message (by thread): rpms/kernel/F-9 patch-2.6.27.23.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.837.2.12, 1.837.2.13 drm-fedora9-rollup.patch, 1.5, 1.5.2.1 kernel.spec, 1.891.2.48, 1.891.2.49 linux-2.6-execshield.patch, 1.90.2.3, 1.90.2.4 linux-2.6-utrace.patch, 1.81, 1.81.2.1 sources, 1.798.2.12, 1.798.2.13 upstream, 1.717.2.12, 1.717.2.13 patch-2.6.27.22.bz2.sign, 1.1.2.1, NONE
- Next message (by thread): rpms/kernel/devel patch-2.6.30-rc5.bz2.sign, NONE, 1.1 .cvsignore, 1.1062, 1.1063 kernel.spec, 1.1541, 1.1542 sources, 1.1021, 1.1022 upstream, 1.935, 1.936 patch-2.6.30-rc4-git4.bz2.sign, 1.1, NONE patch-2.6.30-rc4.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7417
Modified Files:
.cvsignore drm-next.patch kernel.spec
linux-2.6-execshield.patch linux-2.6-iommu-fixes.patch
linux-2.6-utrace.patch sources upstream
Added Files:
patch-2.6.29.3.bz2.sign
Removed Files:
drm-intel-g41.patch drm-intel-tiled-front.patch
linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch
linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
patch-2.6.29.2.bz2.sign
Log Message:
* Fri May 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.3-135
- Linux 2.6.29.3
- Merged patches:
linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch
drm-intel-g41.patch
drm-intel-tiled-front.patch
- Rebased patches:
drm-next.patch - pci ids rejects
linux-2.6-utrace.patch - fs/proc/array.c rejects
linux-2.6-execshield.patch - fs/proc/array.c, drop useless hunk, dropped
already in rawhide.
linux-2.6-iommu-fixes.patch - single merged patch from series.
--- NEW FILE patch-2.6.29.3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBKBL7GyGugalF9Dw4RArL7AJ9qZ0fGGvgIgKug0w7AgSicwrMLhgCcD/K5
Ns+6f893VlNMJBHqPDNO74E=
=QM5o
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1042
retrieving revision 1.1043
diff -u -p -r1.1042 -r1.1043
--- .cvsignore 1 May 2009 18:41:25 -0000 1.1042
+++ .cvsignore 9 May 2009 02:08:22 -0000 1.1043
@@ -5,4 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.29
linux-2.6.29.tar.bz2
-patch-2.6.29.2.bz2
+patch-2.6.29.3.bz2
drm-next.patch:
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-next.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- drm-next.patch 6 May 2009 03:12:02 -0000 1.17
+++ drm-next.patch 9 May 2009 02:08:23 -0000 1.18
@@ -3280,7 +3280,7 @@ index b293ef0..2c01676 100644
.name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index d6cc986..317b122 100644
+index 9239747..d9a39e1 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -159,6 +159,9 @@ typedef struct drm_i915_private {
@@ -3340,8 +3340,8 @@ index d6cc986..317b122 100644
/* i915_suspend.c */
extern int i915_save_state(struct drm_device *dev);
extern int i915_restore_state(struct drm_device *dev);
-@@ -784,15 +791,21 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
- (dev)->pci_device == 0x2E22 || \
+@@ -786,15 +793,21 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+ (dev)->pci_device == 0x2E32 || \
IS_GM45(dev))
+#define IS_IGDG(dev) ((dev)->pci_device == 0xa001)
@@ -3364,7 +3364,7 @@ index d6cc986..317b122 100644
#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev))
/* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte
-@@ -801,6 +814,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+@@ -803,6 +816,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define HAS_128_BYTE_Y_TILING(dev) (IS_I9XX(dev) && !(IS_I915G(dev) || \
IS_I915GM(dev)))
#define SUPPORTS_INTEGRATED_HDMI(dev) (IS_G4X(dev))
@@ -5632,7 +5632,7 @@ index 87b6b60..ee7ce7b 100644
I915_WRITE(PIPEASTAT, 0);
I915_WRITE(PIPEBSTAT, 0);
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index cc2938d..e805b59 100644
+index a787fb8..5211947 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -190,6 +190,8 @@
@@ -5792,7 +5792,7 @@ index 61c108e..9bdd959 100644
if (IS_GM45(dev))
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 601a76f..64773ce 100644
+index 254c5ca..080f92d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -56,11 +56,13 @@ typedef struct {
@@ -6280,7 +6280,7 @@ index 601a76f..64773ce 100644
}
static int
-@@ -634,7 +951,7 @@ static int intel_get_core_clock_speed(struct drm_device *dev)
+@@ -643,7 +960,7 @@ static int intel_get_core_clock_speed(struct drm_device *dev)
return 400000;
else if (IS_I915G(dev))
return 333000;
@@ -6289,7 +6289,7 @@ index 601a76f..64773ce 100644
return 200000;
else if (IS_I915GM(dev)) {
u16 gcfgc = 0;
-@@ -733,6 +1050,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -742,6 +1059,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
bool is_crt = false, is_lvds = false, is_tv = false;
struct drm_mode_config *mode_config = &dev->mode_config;
struct drm_connector *connector;
@@ -6297,7 +6297,7 @@ index 601a76f..64773ce 100644
int ret;
drm_vblank_pre_modeset(dev, pipe);
-@@ -776,13 +1094,42 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -785,13 +1103,42 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
refclk = 48000;
}
@@ -6342,7 +6342,7 @@ index 601a76f..64773ce 100644
dpll = DPLL_VGA_MODE_DIS;
if (IS_I9XX(dev)) {
-@@ -799,7 +1146,10 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -808,7 +1155,10 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
}
/* compute bitmask from p1 value */
@@ -6354,7 +6354,7 @@ index 601a76f..64773ce 100644
switch (clock.p2) {
case 5:
dpll |= DPLL_DAC_SERIAL_P2_CLOCK_DIV_5;
-@@ -1279,10 +1629,20 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
+@@ -1288,10 +1638,20 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
fp = I915_READ((pipe == 0) ? FPA1 : FPB1);
clock.m1 = (fp & FP_M1_DIV_MASK) >> FP_M1_DIV_SHIFT;
@@ -6378,7 +6378,7 @@ index 601a76f..64773ce 100644
DPLL_FPA01_P1_POST_DIV_SHIFT);
switch (dpll & DPLL_MODE_MASK) {
-@@ -1301,7 +1661,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
+@@ -1310,7 +1670,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
}
/* XXX: Handle the 100Mhz refclk */
@@ -6387,7 +6387,7 @@ index 601a76f..64773ce 100644
} else {
bool is_lvds = (pipe == 1) && (I915_READ(LVDS) & LVDS_PORT_EN);
-@@ -1313,9 +1673,9 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
+@@ -1322,9 +1682,9 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
if ((dpll & PLL_REF_INPUT_MASK) ==
PLLB_REF_INPUT_SPREADSPECTRUMIN) {
/* XXX: might not be 66MHz */
@@ -6399,7 +6399,7 @@ index 601a76f..64773ce 100644
} else {
if (dpll & PLL_P1_DIVIDE_BY_TWO)
clock.p1 = 2;
-@@ -1328,7 +1688,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
+@@ -1337,7 +1697,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
else
clock.p2 = 2;
@@ -35644,7 +35644,7 @@ index 8dbd257..26641e9 100644
/** Write memory barrier */
#define DRM_WRITEMEMORYBARRIER() wmb()
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
-index 5165f24..2df74eb 100644
+index 671fab3..cdc8cb8 100644
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
@@ -239,10 +239,123 @@
@@ -35771,10 +35771,10 @@ index 5165f24..2df74eb 100644
{0, 0, 0}
#define r128_PCI_IDS \
-@@ -418,4 +531,6 @@
- {0x8086, 0x2e02, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+@@ -419,4 +532,6 @@
{0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
{0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+ {0x8086, 0x2e32, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+ {0x8086, 0xa001, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+ {0x8086, 0xa011, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
{0, 0, 0}
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1596
retrieving revision 1.1597
diff -u -p -r1.1596 -r1.1597
--- kernel.spec 8 May 2009 14:45:02 -0000 1.1596
+++ kernel.spec 9 May 2009 02:08:24 -0000 1.1597
@@ -37,7 +37,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -670,7 +670,6 @@ Patch682: linux-2.6-ipw2x00-age-scan-res
Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
Patch685: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
-Patch686: linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch
Patch700: linux-2.6-dma-debug-fixes.patch
@@ -693,11 +692,9 @@ Patch1818: drm-i915-resume-force-mode.pa
Patch1819: drm-intel-big-hammer.patch
Patch1821: drm-intel-lying-systems-without-lvds.patch
Patch1822: drm-intel-gen3-fb-hack.patch
-Patch1823: drm-intel-tiled-front.patch
Patch1824: drm-intel-hdmi-edid-fix.patch
Patch1825: drm-intel-tiling-transition.patch
Patch1826: drm-intel-next.patch
-Patch1827: drm-intel-g41.patch
Patch1828: drm-intel-debugfs-ringbuffer.patch
# kludge to make ich9 e1000 work
@@ -748,9 +745,6 @@ Patch9003: linux-2.6-dropwatch-protocol.
Patch9303: linux-2.6-kvm-skip-pit-check.patch
Patch9304: linux-2.6-xen-check-for-nx-support.patch
-# FPU state can become corrupt
-Patch9510: linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
-
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1323,9 +1317,6 @@ ApplyPatch linux-2.6-iwlagn-fix-hw-rfkil
# back-port mac80211: fix beacon loss detection after scan
ApplyPatch linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
-# back-port ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling
-ApplyPatch linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch
-
# Fix up DMA debug code
ApplyPatch linux-2.6-dma-debug-fixes.patch
@@ -1353,11 +1344,9 @@ ApplyPatch drm-i915-resume-force-mode.pa
ApplyPatch drm-intel-big-hammer.patch
ApplyPatch drm-intel-lying-systems-without-lvds.patch
ApplyPatch drm-intel-gen3-fb-hack.patch
-ApplyPatch drm-intel-tiled-front.patch
ApplyPatch drm-intel-hdmi-edid-fix.patch
ApplyPatch drm-intel-tiling-transition.patch
ApplyPatch drm-intel-next.patch
-ApplyPatch drm-intel-g41.patch
ApplyPatch drm-intel-debugfs-ringbuffer.patch
# linux1394 git patches
@@ -1393,7 +1382,6 @@ ApplyPatch linux-2.6-dropwatch-protocol.
ApplyPatch linux-2.6-kvm-skip-pit-check.patch
ApplyPatch linux-2.6-xen-check-for-nx-support.patch
-ApplyPatch linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
# END OF PATCH APPLICATIONS
@@ -1981,6 +1969,20 @@ fi
# and build.
%changelog
+* Fri May 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.3-135
+- Linux 2.6.29.3
+- Merged patches:
+ linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch
+ linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch
+ drm-intel-g41.patch
+ drm-intel-tiled-front.patch
+- Rebased patches:
+ drm-next.patch - pci ids rejects
+ linux-2.6-utrace.patch - fs/proc/array.c rejects
+ linux-2.6-execshield.patch - fs/proc/array.c, drop useless hunk, dropped
+ already in rawhide.
+ linux-2.6-iommu-fixes.patch - single merged patch from series.
+
* Fri May 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.2-134
- linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch
linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
linux-2.6-execshield.patch:
Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-execshield.patch,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- linux-2.6-execshield.patch 11 Mar 2009 16:28:50 -0000 1.104
+++ linux-2.6-execshield.patch 9 May 2009 02:08:24 -0000 1.105
@@ -589,29 +589,6 @@ index 33b7235..ce1f044 100644
/*
* load_elf_interp() returns relocation
* adjustment
-diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 7e4877d..0c368c1 100644
---- a/fs/proc/array.c
-+++ b/fs/proc/array.c
-@@ -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;
-+ cred = __task_cred(task);
-+ if (current_uid() == cred->uid || current_euid() == cred->uid ||
-+ capable(CAP_SYS_NICE))
-+ wchan = get_wchan(task);
-+ }
-+
- if (!whole) {
- min_flt = task->min_flt;
- maj_flt = task->maj_flt;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 065cdf8..aa94aa9 100644
--- a/include/linux/mm.h
linux-2.6-iommu-fixes.patch:
Index: linux-2.6-iommu-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-iommu-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-iommu-fixes.patch 11 Apr 2009 05:53:07 -0000 1.1
+++ linux-2.6-iommu-fixes.patch 9 May 2009 02:08:24 -0000 1.2
@@ -161,8 +161,9 @@ Date: Mon Mar 16 17:04:54 2009 -0700
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
(cherry picked from commit 0ac2491f57af5644f88383d28809760902d6f4d7)
+
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
-index 26c536b..e095037 100644
+index 8a01120..e095037 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -31,6 +31,8 @@
@@ -174,30 +175,7 @@ index 26c536b..e095037 100644
#undef PREFIX
#define PREFIX "DMAR:"
-@@ -170,12 +172,21 @@ dmar_parse_one_drhd(struct acpi_dmar_header *header)
- struct dmar_drhd_unit *dmaru;
- int ret = 0;
-
-+ drhd = (struct acpi_dmar_hardware_unit *)header;
-+ if (!drhd->address) {
-+ /* Promote an attitude of violence to a BIOS engineer today */
-+ WARN(1, "Your BIOS is broken; DMAR reported at address zero!\n"
-+ "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
-+ dmi_get_system_info(DMI_BIOS_VENDOR),
-+ dmi_get_system_info(DMI_BIOS_VERSION),
-+ dmi_get_system_info(DMI_PRODUCT_VERSION));
-+ return -ENODEV;
-+ }
- dmaru = kzalloc(sizeof(*dmaru), GFP_KERNEL);
- if (!dmaru)
- return -ENOMEM;
-
- dmaru->hdr = header;
-- drhd = (struct acpi_dmar_hardware_unit *)header;
- dmaru->reg_base_addr = drhd->address;
- dmaru->include_all = drhd->flags & 0x1; /* BIT0: INCLUDE_ALL */
-
-@@ -748,14 +759,77 @@ int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,
+@@ -757,14 +759,77 @@ int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,
}
/*
@@ -277,7 +255,7 @@ index 26c536b..e095037 100644
struct q_inval *qi;
if (!ecap_qis(iommu->ecap))
-@@ -793,19 +867,218 @@ int dmar_enable_qi(struct intel_iommu *iommu)
+@@ -802,19 +867,218 @@ int dmar_enable_qi(struct intel_iommu *iommu)
spin_lock_init(&qi->q_lock);
@@ -507,7 +485,7 @@ index 26c536b..e095037 100644
return 0;
}
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
-index f3f6865..8e4ac13 100644
+index 7e4f9e6..8e4ac13 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -36,6 +36,7 @@
@@ -518,26 +496,7 @@ index f3f6865..8e4ac13 100644
#include <asm/cacheflush.h>
#include <asm/iommu.h>
#include "pci.h"
-@@ -447,11 +448,17 @@ static struct intel_iommu *device_to_iommu(u8 bus, u8 devfn)
- if (drhd->ignored)
- continue;
-
-- for (i = 0; i < drhd->devices_cnt; i++)
-+ for (i = 0; i < drhd->devices_cnt; i++) {
- if (drhd->devices[i] &&
- drhd->devices[i]->bus->number == bus &&
- drhd->devices[i]->devfn == devfn)
- return drhd->iommu;
-+ if (drhd->devices[i] &&
-+ drhd->devices[i]->subordinate &&
-+ drhd->devices[i]->subordinate->number <= bus &&
-+ drhd->devices[i]->subordinate->subordinate >= bus)
-+ return drhd->iommu;
-+ }
-
- if (drhd->include_all)
- return drhd->iommu;
-@@ -1004,194 +1011,6 @@ static int iommu_disable_translation(struct intel_iommu *iommu)
+@@ -1010,194 +1011,6 @@ static int iommu_disable_translation(struct intel_iommu *iommu)
return 0;
}
@@ -732,18 +691,18 @@ index f3f6865..8e4ac13 100644
static int iommu_init_domains(struct intel_iommu *iommu)
{
-@@ -2043,11 +1862,40 @@ static int __init init_dmars(void)
+@@ -2049,11 +1862,40 @@ static int __init init_dmars(void)
}
}
+ /*
+ * Start from the sane iommu hardware state.
+ */
- for_each_drhd_unit(drhd) {
- if (drhd->ignored)
- continue;
-
- iommu = drhd->iommu;
++ for_each_drhd_unit(drhd) {
++ if (drhd->ignored)
++ continue;
++
++ iommu = drhd->iommu;
+
+ /*
+ * If the queued invalidation is already initialized by us
@@ -764,16 +723,16 @@ index f3f6865..8e4ac13 100644
+ dmar_disable_qi(iommu);
+ }
+
-+ for_each_drhd_unit(drhd) {
-+ if (drhd->ignored)
-+ continue;
-+
-+ iommu = drhd->iommu;
+ for_each_drhd_unit(drhd) {
+ if (drhd->ignored)
+ continue;
+
+ iommu = drhd->iommu;
+
if (dmar_enable_qi(iommu)) {
/*
* Queued Invalidate not enabled, use Register Based
-@@ -2707,6 +2555,150 @@ static void __init init_no_remapping_devices(void)
+@@ -2713,6 +2555,150 @@ static void __init init_no_remapping_devices(void)
}
}
@@ -924,7 +883,7 @@ index f3f6865..8e4ac13 100644
int __init intel_iommu_init(void)
{
int ret = 0;
-@@ -2742,6 +2734,7 @@ int __init intel_iommu_init(void)
+@@ -2748,6 +2734,7 @@ int __init intel_iommu_init(void)
init_timer(&unmap_timer);
force_iommu = 1;
dma_ops = &intel_dma_ops;
linux-2.6-utrace.patch:
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-utrace.patch,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- linux-2.6-utrace.patch 23 Mar 2009 02:27:36 -0000 1.109
+++ linux-2.6-utrace.patch 9 May 2009 02:08:24 -0000 1.110
@@ -25,22 +25,8 @@ the utrace API.
Signed-off-by: Roland McGrath <roland at redhat.com>
---
- Documentation/DocBook/Makefile | 2 +-
- Documentation/DocBook/utrace.tmpl | 571 +++++++++
- fs/proc/array.c | 3 +
- include/linux/init_task.h | 1 +
- include/linux/sched.h | 6 +
- include/linux/tracehook.h | 50 +-
- include/linux/utrace.h | 692 +++++++++++
- include/linux/utrace_struct.h | 58 +
- init/Kconfig | 9 +
- kernel/Makefile | 1 +
- kernel/ptrace.c | 18 +-
- kernel/utrace.c | 2348 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 3756 insertions(+), 3 deletions(-)
-
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 1462ed8..f5da1b4 100644
+index 1462ed8..f5da1b4 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -9,7 +9,7 @@
@@ -54,7 +40,7 @@ index 1462ed8..f5da1b4 100644
mac80211.xml debugobjects.xml sh.xml regulator.xml
diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
new file mode 100644
-index ...b802c55 100644
+index 0000000..b802c55
--- /dev/null
+++ b/Documentation/DocBook/utrace.tmpl
@@ -0,0 +1,571 @@
@@ -630,18 +616,18 @@ index ...b802c55 100644
+
+</book>
diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 7e4877d..0c683ed 100644
+index 725a650..e299a63 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
-@@ -81,6 +81,7 @@
- #include <linux/seq_file.h>
+@@ -82,6 +82,7 @@
#include <linux/pid_namespace.h>
+ #include <linux/ptrace.h>
#include <linux/tracehook.h>
+#include <linux/utrace.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -187,6 +188,8 @@ static inline void task_state(struct seq
+@@ -188,6 +189,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
cred->uid, cred->euid, cred->suid, cred->fsuid,
cred->gid, cred->egid, cred->sgid, cred->fsgid);
@@ -651,7 +637,7 @@ index 7e4877d..0c683ed 100644
if (p->files)
fdt = files_fdtable(p->files);
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index e752d97..39eebc8 100644
+index e752d97..39eebc8 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -181,6 +181,7 @@ extern struct cred init_cred;
@@ -663,7 +649,7 @@ index e752d97..39eebc8 100644
INIT_TRACE_IRQFLAGS \
INIT_LOCKDEP \
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 011db2f..786ef2d 100644
+index f8af167..454de2a 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -59,6 +59,7 @@ struct sched_param {
@@ -674,7 +660,7 @@ index 011db2f..786ef2d 100644
#include <asm/system.h>
#include <asm/page.h>
-@@ -1287,6 +1288,11 @@ struct task_struct {
+@@ -1288,6 +1289,11 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -687,7 +673,7 @@ index 011db2f..786ef2d 100644
u32 parent_exec_id;
u32 self_exec_id;
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index b622498..6ff7277 100644
+index b622498..6ff7277 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -49,6 +49,7 @@
@@ -707,7 +693,7 @@ index b622498..6ff7277 100644
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall
+@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
static inline __must_check int tracehook_report_syscall_entry(
struct pt_regs *regs)
{
@@ -717,7 +703,7 @@ index b622498..6ff7277 100644
ptrace_report_syscall(regs);
return 0;
}
-@@ -134,6 +140,8 @@ static inline __must_check int tracehook
+@@ -134,6 +140,8 @@ static inline __must_check int tracehook_report_syscall_entry(
*/
static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
{
@@ -726,7 +712,7 @@ index b622498..6ff7277 100644
ptrace_report_syscall(regs);
}
-@@ -194,6 +202,8 @@ static inline void tracehook_report_exec
+@@ -194,6 +202,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
struct linux_binprm *bprm,
struct pt_regs *regs)
{
@@ -735,7 +721,7 @@ index b622498..6ff7277 100644
if (!ptrace_event(PT_TRACE_EXEC, PTRACE_EVENT_EXEC, 0) &&
unlikely(task_ptrace(current) & PT_PTRACED))
send_sig(SIGTRAP, current, 0);
-@@ -211,6 +221,8 @@ static inline void tracehook_report_exec
+@@ -211,6 +221,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
*/
static inline void tracehook_report_exit(long *exit_code)
{
@@ -744,7 +730,7 @@ index b622498..6ff7277 100644
ptrace_event(PT_TRACE_EXIT, PTRACE_EVENT_EXIT, *exit_code);
}
-@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clon
+@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clone(unsigned clone_flags)
static inline void tracehook_finish_clone(struct task_struct *child,
unsigned long clone_flags, int trace)
{
@@ -752,7 +738,7 @@ index b622498..6ff7277 100644
ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace);
}
-@@ -280,6 +293,8 @@ static inline void tracehook_report_clon
+@@ -280,6 +293,8 @@ static inline void tracehook_report_clone(int trace, struct pt_regs *regs,
unsigned long clone_flags,
pid_t pid, struct task_struct *child)
{
@@ -761,7 +747,7 @@ index b622498..6ff7277 100644
if (unlikely(trace) || unlikely(clone_flags & CLONE_PTRACE)) {
/*
* The child starts up with an immediate SIGSTOP.
-@@ -311,6 +326,9 @@ static inline void tracehook_report_clon
+@@ -311,6 +326,9 @@ static inline void tracehook_report_clone_complete(int trace,
pid_t pid,
struct task_struct *child)
{
@@ -771,7 +757,7 @@ index b622498..6ff7277 100644
if (unlikely(trace))
ptrace_event(0, trace, pid);
}
-@@ -345,6 +363,7 @@ static inline void tracehook_report_vfor
+@@ -345,6 +363,7 @@ static inline void tracehook_report_vfork_done(struct task_struct *child,
*/
static inline void tracehook_prepare_release_task(struct task_struct *task)
{
@@ -779,7 +765,7 @@ index b622498..6ff7277 100644
}
/**
-@@ -359,6 +378,7 @@ static inline void tracehook_prepare_rel
+@@ -359,6 +378,7 @@ static inline void tracehook_prepare_release_task(struct task_struct *task)
static inline void tracehook_finish_release_task(struct task_struct *task)
{
ptrace_release_task(task);
@@ -787,7 +773,7 @@ index b622498..6ff7277 100644
}
/**
-@@ -380,6 +400,8 @@ static inline void tracehook_signal_hand
+@@ -380,6 +400,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
const struct k_sigaction *ka,
struct pt_regs *regs, int stepping)
{
@@ -796,7 +782,7 @@ index b622498..6ff7277 100644
if (stepping)
ptrace_notify(SIGTRAP);
}
-@@ -400,6 +422,8 @@ static inline int tracehook_consider_ign
+@@ -400,6 +422,8 @@ static inline int tracehook_consider_ignored_signal(struct task_struct *task,
int sig,
void __user *handler)
{
@@ -805,7 +791,7 @@ index b622498..6ff7277 100644
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -421,6 +445,9 @@ static inline int tracehook_consider_fat
+@@ -421,6 +445,9 @@ static inline int tracehook_consider_fatal_signal(struct task_struct *task,
int sig,
void __user *handler)
{
@@ -815,7 +801,7 @@ index b622498..6ff7277 100644
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -435,6 +462,8 @@ static inline int tracehook_consider_fat
+@@ -435,6 +462,8 @@ static inline int tracehook_consider_fatal_signal(struct task_struct *task,
*/
static inline int tracehook_force_sigpending(void)
{
@@ -824,7 +810,7 @@ index b622498..6ff7277 100644
return 0;
}
-@@ -464,6 +493,8 @@ static inline int tracehook_get_signal(s
+@@ -464,6 +493,8 @@ static inline int tracehook_get_signal(struct task_struct *task,
siginfo_t *info,
struct k_sigaction *return_ka)
{
@@ -833,7 +819,7 @@ index b622498..6ff7277 100644
return 0;
}
-@@ -491,6 +522,8 @@ static inline int tracehook_get_signal(s
+@@ -491,6 +522,8 @@ static inline int tracehook_get_signal(struct task_struct *task,
*/
static inline int tracehook_notify_jctl(int notify, int why)
{
@@ -842,7 +828,7 @@ index b622498..6ff7277 100644
return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
}
-@@ -514,6 +547,8 @@ static inline int tracehook_notify_jctl(
+@@ -514,6 +547,8 @@ static inline int tracehook_notify_jctl(int notify, int why)
static inline int tracehook_notify_death(struct task_struct *task,
void **death_cookie, int group_dead)
{
@@ -851,7 +837,7 @@ index b622498..6ff7277 100644
if (task->exit_signal == -1)
return task->ptrace ? SIGCHLD : DEATH_REAP;
-@@ -550,6 +585,9 @@ static inline void tracehook_report_deat
+@@ -550,6 +585,9 @@ static inline void tracehook_report_death(struct task_struct *task,
int signal, void *death_cookie,
int group_dead)
{
@@ -861,7 +847,7 @@ index b622498..6ff7277 100644
}
#ifdef TIF_NOTIFY_RESUME
-@@ -579,10 +617,20 @@ static inline void set_notify_resume(str
+@@ -579,10 +617,20 @@ static inline void set_notify_resume(struct task_struct *task)
* asynchronously, this will be called again before we return to
* user mode.
*
@@ -885,7 +871,7 @@ index b622498..6ff7277 100644
diff --git a/include/linux/utrace.h b/include/linux/utrace.h
new file mode 100644
-index ...f46cc0f 100644
+index 0000000..f46cc0f
--- /dev/null
+++ b/include/linux/utrace.h
@@ -0,0 +1,692 @@
@@ -1583,7 +1569,7 @@ index ...f46cc0f 100644
+#endif /* linux/utrace.h */
diff --git a/include/linux/utrace_struct.h b/include/linux/utrace_struct.h
new file mode 100644
-index ...aba7e09 100644
+index 0000000..aba7e09
--- /dev/null
+++ b/include/linux/utrace_struct.h
@@ -0,0 +1,58 @@
@@ -1646,7 +1632,7 @@ index ...aba7e09 100644
+
+#endif /* linux/utrace_struct.h */
diff --git a/init/Kconfig b/init/Kconfig
-index 6a5c5fe..4b5ab3e 100644
+index 6a5c5fe..4b5ab3e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1060,6 +1060,15 @@ config STOP_MACHINE
@@ -1666,7 +1652,7 @@ index 6a5c5fe..4b5ab3e 100644
config PREEMPT_NOTIFIERS
diff --git a/kernel/Makefile b/kernel/Makefile
-index e4791b3..7bff724 100644
+index e4791b3..7bff724 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
@@ -1678,7 +1664,7 @@ index e4791b3..7bff724 100644
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index c9cf48b..41e9542 100644
+index dc3b98e..f897ef6 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -16,6 +16,7 @@
@@ -1689,7 +1675,7 @@ index c9cf48b..41e9542 100644
#include <linux/security.h>
#include <linux/signal.h>
#include <linux/audit.h>
-@@ -172,6 +173,14 @@ bool ptrace_may_access(struct task_struc
+@@ -172,6 +173,14 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
return (!err ? true : false);
}
@@ -1729,7 +1715,7 @@ index c9cf48b..41e9542 100644
*/
diff --git a/kernel/utrace.c b/kernel/utrace.c
new file mode 100644
-index ...115be79 100644
+index 0000000..115be79
--- /dev/null
+++ b/kernel/utrace.c
@@ -0,0 +1,2348 @@
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1004
retrieving revision 1.1005
diff -u -p -r1.1004 -r1.1005
--- sources 1 May 2009 18:41:27 -0000 1.1004
+++ sources 9 May 2009 02:08:25 -0000 1.1005
@@ -1,2 +1,2 @@
64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2
-a3e79545ef18ff2a172f82fffef92deb patch-2.6.29.2.bz2
+4e16a087ca4455f5e95c5890c4ac23f6 patch-2.6.29.3.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -p -r1.915 -r1.916
--- upstream 1 May 2009 18:41:27 -0000 1.915
+++ upstream 9 May 2009 02:08:25 -0000 1.916
@@ -1,2 +1,2 @@
linux-2.6.29.tar.bz2
-patch-2.6.29.2.bz2
+patch-2.6.29.3.bz2
--- drm-intel-g41.patch DELETED ---
--- drm-intel-tiled-front.patch DELETED ---
--- linux-2.6-ath9k-Fix-FIF_BCN_PRBRESP_PROMISC-handling.patch DELETED ---
--- linux-2.6-x86-64-fix-fpu-corruption-with-signals-and-preemption.patch DELETED ---
--- patch-2.6.29.2.bz2.sign DELETED ---
- Previous message (by thread): rpms/kernel/F-9 patch-2.6.27.23.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.837.2.12, 1.837.2.13 drm-fedora9-rollup.patch, 1.5, 1.5.2.1 kernel.spec, 1.891.2.48, 1.891.2.49 linux-2.6-execshield.patch, 1.90.2.3, 1.90.2.4 linux-2.6-utrace.patch, 1.81, 1.81.2.1 sources, 1.798.2.12, 1.798.2.13 upstream, 1.717.2.12, 1.717.2.13 patch-2.6.27.22.bz2.sign, 1.1.2.1, NONE
- Next message (by thread): rpms/kernel/devel patch-2.6.30-rc5.bz2.sign, NONE, 1.1 .cvsignore, 1.1062, 1.1063 kernel.spec, 1.1541, 1.1542 sources, 1.1021, 1.1022 upstream, 1.935, 1.936 patch-2.6.30-rc4-git4.bz2.sign, 1.1, NONE patch-2.6.30-rc4.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list