diff mbox series

[API-NEXT,11/15] merge fix: odp_schedule_sp.c

Message ID 20170127142921.29029-12-maxim.uvarov@linaro.org
State New
Headers show
Series Merge tag 'v1.13.0.0' into api-next | expand

Commit Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m. UTC 
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
 platform/linux-generic/odp_schedule_sp.c | 36 --------------------------------
 1 file changed, 36 deletions(-)

-- 
2.11.0.295.gd7dffce
diff mbox series

Patch

diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index 56088bd8..1bc33eb2 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -364,7 +364,6 @@  static inline sched_cmd_t *rem_head(int group, int prio)
 	prio_queue_t *prio_queue;
 	uint32_t ring_idx, index;
 	int pktio;
-<<<<<<< HEAD
 
 	prio_queue = &sched_global.prio_queue[group][prio];
 
@@ -373,16 +372,6 @@  static inline sched_cmd_t *rem_head(int group, int prio)
 	if (ring_idx == RING_EMPTY)
 		return NULL;
 
-=======
-
-	prio_queue = &sched_global.prio_queue[group][prio];
-
-	ring_idx = ring_deq(&prio_queue->ring, RING_MASK);
-
-	if (ring_idx == RING_EMPTY)
-		return NULL;
-
->>>>>>> v1.13.0.0
 	pktio = index_from_ring_idx(&index, ring_idx);
 
 	if (pktio)
@@ -451,7 +440,6 @@  static inline sched_cmd_t *sched_cmd(void)
 	/* There's no matching store_rel since the value is updated while
 	 * holding a lock */
 	gen_cnt = odp_atomic_load_acq_u32(&thr_group->gen_cnt);
-<<<<<<< HEAD
 
 	/* Check if groups have changed and need to be read again */
 	if (odp_unlikely(gen_cnt != sched_local.gen_cnt)) {
@@ -467,23 +455,6 @@  static inline sched_cmd_t *sched_cmd(void)
 
 		odp_ticketlock_unlock(&sched_group->s.lock);
 
-=======
-
-	/* Check if groups have changed and need to be read again */
-	if (odp_unlikely(gen_cnt != sched_local.gen_cnt)) {
-		int num_grp;
-
-		odp_ticketlock_lock(&sched_group->s.lock);
-
-		num_grp = thr_group->num_group;
-		gen_cnt = odp_atomic_load_u32(&thr_group->gen_cnt);
-
-		for (i = 0; i < num_grp; i++)
-			sched_local.group[i] = thr_group->group[i];
-
-		odp_ticketlock_unlock(&sched_group->s.lock);
-
->>>>>>> v1.13.0.0
 		sched_local.num_group = num_grp;
 		sched_local.gen_cnt   = gen_cnt;
 	}
@@ -837,13 +808,10 @@  static void order_unlock(void)
 {
 }
 
-<<<<<<< HEAD
 static void save_context(queue_entry_t *queue ODP_UNUSED)
 {
 }
 
-=======
->>>>>>> v1.13.0.0
 /* Fill in scheduler interface */
 const schedule_fn_t schedule_sp_fn = {
 	.pktio_start   = pktio_start,
@@ -861,12 +829,8 @@  const schedule_fn_t schedule_sp_fn = {
 	.term_local    = term_local,
 	.order_lock =    order_lock,
 	.order_unlock =  order_unlock,
-<<<<<<< HEAD
 	.max_ordered_locks = max_ordered_locks,
 	.save_context  = save_context
-=======
-	.max_ordered_locks = max_ordered_locks
->>>>>>> v1.13.0.0
 };
 
 /* Fill in scheduler API calls */