The patch titled
hpet-factor-timer-allocate-from-open-fix
has been added to the -mm tree. Its filename is
hpet-factor-timer-allocate-from-open-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: hpet-factor-timer-allocate-from-open-fix
From: Arnd Bergmann <arnd@xxxxxxxx>
On Wednesday 29 September 2010, Andrew Morton wrote:
> 2010/9/29 <akpm@xxxxxxxxxxxxxxxxxxxx>:
> > The mm-of-the-moment snapshot 2010-09-28-16-13 has been uploaded to
>
> drivers/char/hpet.c: In function 'hpet_alloc_timer':
> drivers/char/hpet.c:278: error: implicit declaration of function 'unlock_kernel'
> make[2]: *** [drivers/char/hpet.o] BÅ?Ä?d 1
> make[1]: *** [drivers/char] BÅ?Ä?d 2
> make: *** [drivers] BÅ?Ä?d 2
It comes from this patch:
http://userweb.kernel.org/~akpm/mmotm/broken-out/hpet-factor-timer-allocate-from-open.patch
Please fold the hunk below into that patch.
It should also be possible to get rid of the hpet_mutex entirely by
using hpet_lock consistently in the ioctl functions. Two global locks
for one driver is a bit too much.
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Magnus Lynch <maglyx@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Cc: Clemens Ladisch <clemens@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/hpet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/char/hpet.c~hpet-factor-timer-allocate-from-open-fix drivers/char/hpet.c
--- a/drivers/char/hpet.c~hpet-factor-timer-allocate-from-open-fix
+++ a/drivers/char/hpet.c
@@ -275,7 +275,7 @@ static int hpet_alloc_timer(struct file
devp = file->private_data;
if (devp->hd_timer) {
spin_unlock_irq(&hpet_lock);
- unlock_kernel();
+ mutex_unlock(&hpet_mutex);
return 0;
}
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
origin.patch
linux-next.patch
hpet-factor-timer-allocate-from-open-fix.patch
add-the-common-dma_addr_t-typedef-to-include-linux-typesh.patch
autofs-only-declare-function-when-config_compat-is-defined.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
