From: Paul Mundt <lethal@linux-sh.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH -mm] hrtimer: Build fix for !KTIME_SCALAR on 32bit.
Date: Tue, 11 Sep 2007 15:39:47 +0900 [thread overview]
Message-ID: <20070911063947.GA18918@linux-sh.org> (raw)
On BITS_PER_LONG < 64 and !CONFIG_KTIME_SCALAR we get this:
CC kernel/hrtimer.o
kernel/hrtimer.c:303: error: redefinition of '__kstrtab_ktime_add_ns'
kernel/hrtimer.c:279: error: previous definition of '__kstrtab_ktime_add_ns' was here
kernel/hrtimer.c:303: error: redefinition of '__ksymtab_ktime_add_ns'
kernel/hrtimer.c:279: error: previous definition of '__ksymtab_ktime_add_ns' was here
kernel/hrtimer.c:313: error: redefinition of 'ktime_sub_ns'
kernel/hrtimer.c:289: error: previous definition of 'ktime_sub_ns' was here
make[1]: *** [kernel/hrtimer.o] Error 1
make: *** [kernel] Error 2
For some reason the ktime_sub_ns() addition was duplicated, and someone
forgot to change the name of the ktime_add_ns() symbol export they lifted.
Get it building again.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
--
kernel/hrtimer.c | 24 ------------------------
1 file changed, 24 deletions(-)
--- linux-2.6.23-rc4-mm1.orig/kernel/hrtimer.c 2007-09-11 15:15:56.000000000 +0900
+++ linux-2.6.23-rc4-mm1/kernel/hrtimer.c 2007-09-11 15:30:20.000000000 +0900
@@ -300,30 +300,6 @@
return ktime_sub(kt, tmp);
}
-EXPORT_SYMBOL_GPL(ktime_add_ns);
-
-/**
- * ktime_sub_ns - Subtract a scalar nanoseconds value from a ktime_t variable
- * @kt: minuend
- * @nsec: the scalar nsec value to subtract
- *
- * Returns the subtraction of @nsec from @kt in ktime_t format
- */
-ktime_t ktime_sub_ns(const ktime_t kt, u64 nsec)
-{
- ktime_t tmp;
-
- if (likely(nsec < NSEC_PER_SEC)) {
- tmp.tv64 = nsec;
- } else {
- unsigned long rem = do_div(nsec, NSEC_PER_SEC);
-
- tmp = ktime_set((long)nsec, rem);
- }
-
- return ktime_sub(kt, tmp);
-}
-
EXPORT_SYMBOL_GPL(ktime_sub_ns);
# endif /* !CONFIG_KTIME_SCALAR */
reply other threads:[~2007-09-11 6:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070911063947.GA18918@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.