From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Jonas Bonn <jonas@southpole.se>, Alan Cox <alan@linux.intel.com>
Subject: linux-next: build failure after merge of the origin tree
Date: Mon, 25 Jul 2011 11:16:27 +1000 [thread overview]
Message-ID: <20110725111627.0b0d8c8f0b73cff8f6ab85e9@canb.auug.org.au> (raw)
Hi Linus,
After merging the origin tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: "__bad_udelay" [drivers/staging/gma500/psb_gfx.ko] undefined!
Presumably caused by commit a87e553fabe8 ("asm-generic: delay.h fix
udelay and ndelay for 8 bit args").
drivers/staging/gma500/psb_intel_display.c has a udelay
(20000) which is explicitly disallowed by this patch.
I have added the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 Jul 2011 11:13:13 +1000
Subject: [PATCH] gma500: udlay(20000) is too large
So we use mdelay(20) instead. Fixes this build error:
ERROR: "__bad_udelay" [drivers/staging/gma500/psb_gfx.ko] undefined!
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/gma500/psb_intel_display.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c
index 4f47d09..09e378d 100644
--- a/drivers/staging/gma500/psb_intel_display.c
+++ b/drivers/staging/gma500/psb_intel_display.c
@@ -331,7 +331,7 @@ static bool psb_intel_find_best_PLL(struct drm_crtc *crtc, int target,
void psb_intel_wait_for_vblank(struct drm_device *dev)
{
/* Wait for 20ms, i.e. one cycle at 50hz. */
- udelay(20000);
+ mdelay(20);
}
int psb_intel_pipe_set_base(struct drm_crtc *crtc,
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2011-07-25 1:16 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-25 1:16 Stephen Rothwell [this message]
2011-11-06 23:12 linux-next: build failure after merge of the origin tree Stephen Rothwell
2011-11-07 1:52 ` David Miller
2011-11-07 2:47 ` Stephen Rothwell
2011-11-07 3:36 ` David Miller
2011-11-07 5:29 ` Kirsher, Jeffrey T
2011-11-07 16:46 ` Rose, Gregory V
2011-11-07 17:46 ` Rose, Gregory V
2012-01-18 23:31 Stephen Rothwell
2012-01-19 8:21 ` Jens Axboe
2012-01-19 8:23 ` Jens Axboe
2012-06-04 2:57 Stephen Rothwell
2012-06-04 7:39 ` Paul Mundt
2012-10-09 23:21 Stephen Rothwell
2012-10-09 23:45 ` Andrew Morton
2012-10-09 23:52 ` Yasuaki Ishimatsu
2012-10-10 3:12 ` Stephen Rothwell
2012-10-10 0:07 ` Stephen Rothwell
2020-01-31 4:12 Stephen Rothwell
2020-01-31 4:17 ` Randy Dunlap
2020-01-31 9:39 ` Daniel Lezcano
2020-04-20 10:23 Stephen Rothwell
2020-06-04 22:37 Stephen Rothwell
2020-06-05 0:04 ` Josh Poimboeuf
2020-06-05 9:48 ` Jessica Yu
2020-07-29 23:08 Stephen Rothwell
2020-07-29 23:43 ` Linus Torvalds
2020-07-30 0:09 ` Linus Torvalds
2020-07-30 2:12 ` Linus Torvalds
2020-07-30 2:30 ` Willy Tarreau
2020-07-30 3:17 ` Kees Cook
2020-07-30 3:22 ` Willy Tarreau
2020-07-30 6:14 ` Willy Tarreau
2020-07-30 9:59 ` Marc Zyngier
2020-07-30 10:09 ` Catalin Marinas
2020-07-30 15:00 ` Will Deacon
2020-07-30 17:49 ` Kees Cook
2020-07-30 18:24 ` Linus Torvalds
2020-07-30 18:47 ` Kees Cook
2020-07-30 22:58 Stephen Rothwell
2020-07-30 23:15 ` Stephen Rothwell
2021-09-07 23:07 Stephen Rothwell
2021-09-07 23:09 ` Stephen Rothwell
2021-09-07 23:17 ` Marco Elver
2021-09-07 23:38 ` Miguel Ojeda
2021-09-14 0:08 Stephen Rothwell
2021-09-14 0:19 ` Linus Torvalds
2021-09-14 0:24 ` Linus Torvalds
2021-09-14 0:58 ` Stephen Rothwell
2021-09-14 1:29 ` Linus Torvalds
2021-09-14 1:37 ` Linus Torvalds
2021-09-14 2:03 ` Linus Torvalds
2021-09-14 2:08 ` Stephen Rothwell
2021-09-14 2:12 ` Linus Torvalds
2021-09-14 2:50 ` Michael Ellerman
2021-09-14 12:21 ` Michael Ellerman
2021-09-14 2:39 ` Stephen Rothwell
2021-09-19 23:42 Stephen Rothwell
2023-06-30 2:59 Stephen Rothwell
2023-06-30 3:43 ` Linus Torvalds
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=20110725111627.0b0d8c8f0b73cff8f6ab85e9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=alan@linux.intel.com \
--cc=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=torvalds@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).