[arch-commits] Commit in linux/repos/core-x86_64 (3 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Tue Feb 26 11:10:05 UTC 2013
Date: Tuesday, February 26, 2013 @ 12:10:05
Author: tpowa
Revision: 178705
remove not needed patches#
Modified:
linux/repos/core-x86_64/linux.install
Deleted:
linux/repos/core-x86_64/drm-fix-track-free-areas-3.7.patch
linux/repos/core-x86_64/fix-watchdog-3.7.patch
------------------------------------+
drm-fix-track-free-areas-3.7.patch | 153 -----------------------------------
fix-watchdog-3.7.patch | 38 --------
linux.install | 2
3 files changed, 1 insertion(+), 192 deletions(-)
Deleted: drm-fix-track-free-areas-3.7.patch
===================================================================
--- drm-fix-track-free-areas-3.7.patch 2013-02-26 11:09:27 UTC (rev 178704)
+++ drm-fix-track-free-areas-3.7.patch 2013-02-26 11:10:05 UTC (rev 178705)
@@ -1,153 +0,0 @@
-From 9ff0ab9881bd47f7d8a95c07a2fa61f594a91d0a Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Sun, 16 Dec 2012 16:15:00 +0000
-Subject: [PATCH] drm: Only evict the blocks required to create the requested
- hole
-
-Avoid clobbering adjacent blocks if they happen to expire earlier and
-amalgamate together to form the requested hole.
-
-In passing this fixes a regression from
-commit ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c
-Author: Daniel Vetter <daniel.vetter at ffwll.ch>
-Date: Fri Feb 18 17:59:12 2011 +0100
-
- drm: mm: track free areas implicitly
-
-which swaps the end address for size (with a potential overflow) and
-effectively causes the eviction code to clobber almost all earlier
-buffers above the evictee.
-
-v2: Check the original hole not the adjusted as the coloring may confuse
-us when later searching for the overlapping nodes. Also make sure that
-we do apply the range restriction and color adjustment in the same
-order for both scanning, searching and insertion.
-
-Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
-Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
----
- drivers/gpu/drm/drm_mm.c | 45 +++++++++++++++++----------------------------
- include/drm/drm_mm.h | 2 +-
- 2 files changed, 18 insertions(+), 29 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
-index 0761a03..665553c 100644
---- a/drivers/gpu/drm/drm_mm.c
-+++ b/drivers/gpu/drm/drm_mm.c
-@@ -213,11 +213,13 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
-
- BUG_ON(!hole_node->hole_follows || node->allocated);
-
-- if (mm->color_adjust)
-- mm->color_adjust(hole_node, color, &adj_start, &adj_end);
--
- if (adj_start < start)
- adj_start = start;
-+ if (adj_end > end)
-+ adj_end = end;
-+
-+ if (mm->color_adjust)
-+ mm->color_adjust(hole_node, color, &adj_start, &adj_end);
-
- if (alignment) {
- unsigned tmp = adj_start % alignment;
-@@ -489,7 +491,7 @@ void drm_mm_init_scan(struct drm_mm *mm,
- mm->scan_size = size;
- mm->scanned_blocks = 0;
- mm->scan_hit_start = 0;
-- mm->scan_hit_size = 0;
-+ mm->scan_hit_end = 0;
- mm->scan_check_range = 0;
- mm->prev_scanned_node = NULL;
- }
-@@ -516,7 +518,7 @@ void drm_mm_init_scan_with_range(struct drm_mm *mm,
- mm->scan_size = size;
- mm->scanned_blocks = 0;
- mm->scan_hit_start = 0;
-- mm->scan_hit_size = 0;
-+ mm->scan_hit_end = 0;
- mm->scan_start = start;
- mm->scan_end = end;
- mm->scan_check_range = 1;
-@@ -535,8 +537,7 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
- struct drm_mm *mm = node->mm;
- struct drm_mm_node *prev_node;
- unsigned long hole_start, hole_end;
-- unsigned long adj_start;
-- unsigned long adj_end;
-+ unsigned long adj_start, adj_end;
-
- mm->scanned_blocks++;
-
-@@ -553,14 +554,8 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
- node->node_list.next = &mm->prev_scanned_node->node_list;
- mm->prev_scanned_node = node;
-
-- hole_start = drm_mm_hole_node_start(prev_node);
-- hole_end = drm_mm_hole_node_end(prev_node);
--
-- adj_start = hole_start;
-- adj_end = hole_end;
--
-- if (mm->color_adjust)
-- mm->color_adjust(prev_node, mm->scan_color, &adj_start, &adj_end);
-+ adj_start = hole_start = drm_mm_hole_node_start(prev_node);
-+ adj_end = hole_end = drm_mm_hole_node_end(prev_node);
-
- if (mm->scan_check_range) {
- if (adj_start < mm->scan_start)
-@@ -569,11 +564,14 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
- adj_end = mm->scan_end;
- }
-
-+ if (mm->color_adjust)
-+ mm->color_adjust(prev_node, mm->scan_color,
-+ &adj_start, &adj_end);
-+
- if (check_free_hole(adj_start, adj_end,
- mm->scan_size, mm->scan_alignment)) {
- mm->scan_hit_start = hole_start;
-- mm->scan_hit_size = hole_end;
--
-+ mm->scan_hit_end = hole_end;
- return 1;
- }
-
-@@ -609,19 +607,10 @@ int drm_mm_scan_remove_block(struct drm_mm_node *node)
- node_list);
-
- prev_node->hole_follows = node->scanned_preceeds_hole;
-- INIT_LIST_HEAD(&node->node_list);
- list_add(&node->node_list, &prev_node->node_list);
-
-- /* Only need to check for containement because start&size for the
-- * complete resulting free block (not just the desired part) is
-- * stored. */
-- if (node->start >= mm->scan_hit_start &&
-- node->start + node->size
-- <= mm->scan_hit_start + mm->scan_hit_size) {
-- return 1;
-- }
--
-- return 0;
-+ return (drm_mm_hole_node_end(node) > mm->scan_hit_start &&
-+ node->start < mm->scan_hit_end);
- }
- EXPORT_SYMBOL(drm_mm_scan_remove_block);
-
-diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
-index 06d7f79..a1b66b7 100644
---- a/include/drm/drm_mm.h
-+++ b/include/drm/drm_mm.h
-@@ -70,7 +70,7 @@ struct drm_mm {
- unsigned long scan_color;
- unsigned long scan_size;
- unsigned long scan_hit_start;
-- unsigned scan_hit_size;
-+ unsigned long scan_hit_end;
- unsigned scanned_blocks;
- unsigned long scan_start;
- unsigned long scan_end;
---
-1.7.10.4
-
Deleted: fix-watchdog-3.7.patch
===================================================================
--- fix-watchdog-3.7.patch 2013-02-26 11:09:27 UTC (rev 178704)
+++ fix-watchdog-3.7.patch 2013-02-26 11:10:05 UTC (rev 178705)
@@ -1,38 +0,0 @@
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62
-
-diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 997c6a1..75a2ab3 100644
---- a/kernel/watchdog.c
-+++ b/kernel/watchdog.c
-@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu)
- {
- struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
-
-+ /* kick off the timer for the hardlockup detector */
-+ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-+ hrtimer->function = watchdog_timer_fn;
-+
- if (!watchdog_enabled) {
- kthread_park(current);
- return;
-@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu)
- /* Enable the perf event */
- watchdog_nmi_enable(cpu);
-
-- /* kick off the timer for the hardlockup detector */
-- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-- hrtimer->function = watchdog_timer_fn;
--
- /* done here because hrtimer_start can only pin to smp_processor_id() */
- hrtimer_start(hrtimer, ns_to_ktime(sample_period),
- HRTIMER_MODE_REL_PINNED);
-@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu)
- {
- struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
-
-- if (!watchdog_enabled)
-- return;
--
- watchdog_set_prio(SCHED_NORMAL, 0);
- hrtimer_cancel(hrtimer);
- /* disable the perf event */
Modified: linux.install
===================================================================
--- linux.install 2013-02-26 11:09:27 UTC (rev 178704)
+++ linux.install 2013-02-26 11:10:05 UTC (rev 178705)
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.7.9-1-ARCH
+KERNEL_VERSION=3.7.9-2-ARCH
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
More information about the arch-commits
mailing list