From 494bca763c3dbc01d0be51b71765fc6d2243ad48 Mon Sep 17 00:00:00 2001 From: Jan Stoess Date: Thu, 1 Jul 2010 13:25:04 +0200 Subject: [PATCH] -Don't parse pagetables for get_on_cpu if SMP is disabled -Remove debug output --- kernel/kdb/api/v4/schedule-rr.cc | 1 - kernel/src/api/v4/smp.h | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/kdb/api/v4/schedule-rr.cc b/kernel/kdb/api/v4/schedule-rr.cc index 13764013..bb9d885a 100644 --- a/kernel/kdb/api/v4/schedule-rr.cc +++ b/kernel/kdb/api/v4/schedule-rr.cc @@ -66,7 +66,6 @@ static void show_sched_queue(bool empty) { /* check whether we have something for this prio */ tcb_t* walk = global_present_list; - printf("tcb %t\n", walk); do { if (walk->sched_state.get_priority() == prio && walk->get_cpu() == cpu) diff --git a/kernel/src/api/v4/smp.h b/kernel/src/api/v4/smp.h index 70617733..91f4e321 100644 --- a/kernel/src/api/v4/smp.h +++ b/kernel/src/api/v4/smp.h @@ -1,6 +1,6 @@ /********************************************************************* * - * Copyright (C) 2002-2003, 2006, 2008-2009, Karlsruhe University + * Copyright (C) 2002-2003, 2006, 2008-2010, Karlsruhe University * * File path: api/v4/smp.h * Description: multiprocessor handling @@ -38,6 +38,7 @@ template INLINE T *get_on_cpu(cpuid_t cpu, T *item) { +#if defined(CONFIG_SMP) pgent_t *pgent; pgent_t::pgsize_e pgsize; space_t *kspace = get_kernel_space(); @@ -48,9 +49,13 @@ template INLINE T *get_on_cpu(cpuid_t cpu, T *item) addr_mask(item, page_mask (pgsize))); else return NULL; + +#else + return item; +#endif } -#if defined (CONFIG_SMP) +#if defined(CONFIG_SMP) #define ON_CONFIG_SMP(x) do { x; } while(0)