From patchwork Mon Oct 12 21:19:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 53211 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9CLU8JV025169 for ; Mon, 12 Oct 2009 21:30:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757812AbZJLVUE (ORCPT ); Mon, 12 Oct 2009 17:20:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757919AbZJLVUE (ORCPT ); Mon, 12 Oct 2009 17:20:04 -0400 Received: from server19320154104.serverpool.info ([193.201.54.104]:56583 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757642AbZJLVUB (ORCPT ); Mon, 12 Oct 2009 17:20:01 -0400 Received: from localhost (localhost [127.0.0.1]) by hauke-m.de (Postfix) with ESMTP id 7922881EC; Mon, 12 Oct 2009 23:19:24 +0200 (CEST) Received: from hauke-m.de ([127.0.0.1]) by localhost (hauke-m.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vOXEeiS3udEe; Mon, 12 Oct 2009 23:19:20 +0200 (CEST) Received: from localhost.localdomain (dyndsl-085-016-164-212.ewe-ip-backbone.de [85.16.164.212]) by hauke-m.de (Postfix) with ESMTPSA id 1ACCA81EE; Mon, 12 Oct 2009 23:19:20 +0200 (CEST) From: Hauke Mehrtens To: lrodriguez@atheros.com Cc: linux-wireless@vger.kernel.org, Hauke Mehrtens , larry.finger@gmail.com Subject: [PATCH 1/9] [compat-2.6 and compat-stable] Export round_jiffies_up again. Date: Mon, 12 Oct 2009 23:19:09 +0200 Message-Id: <1255382358-20760-2-git-send-email-hauke@hauke-m.de> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1255382358-20760-1-git-send-email-hauke@hauke-m.de> References: <1255382358-20760-1-git-send-email-hauke@hauke-m.de> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/compat/compat-2.6.28.c b/compat/compat-2.6.28.c index 613b009..33871a2 100644 --- a/compat/compat-2.6.28.c +++ b/compat/compat-2.6.28.c @@ -260,7 +260,6 @@ static unsigned long round_jiffies_common(unsigned long j, int cpu, return j; } -#if 0 /** * round_jiffies_up - function to round jiffies up to a full second * @j: the time in (absolute) jiffies that should be rounded @@ -275,6 +274,5 @@ unsigned long round_jiffies_up(unsigned long j) return round_jiffies_common(j, raw_smp_processor_id(), true); } EXPORT_SYMBOL_GPL(round_jiffies_up); -#endif #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) */ diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h index 4e5a2ef..90d080c 100644 --- a/compat/compat-2.6.28.h +++ b/compat/compat-2.6.28.h @@ -195,6 +195,11 @@ static inline void tracepoint_update_probe_range(struct tracepoint *begin, #endif +/* openSuse includes round_jiffies_up in it's kernel 2.6.27. + * This is needed to prevent conflicts with the openSuse definition. + */ +#define round_jiffies_up backport_round_jiffies_up + unsigned long round_jiffies_up(unsigned long j); #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)) */