The patch titled parisc: use "unsigned long flags" in semaphore code has been added to the -mm tree. Its filename is parisc-use-unsigned-long-flags-in-semaphore-code.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: parisc: use "unsigned long flags" in semaphore code From: Alexey Dobriyan <adobriyan@xxxxxxxxx> Just like everyone else. Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxx> Cc: Kyle McMartin <kyle@xxxxxxxxxxx> Cc: Grant Grundler <grundler@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/asm-parisc/semaphore.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff -puN include/asm-parisc/semaphore.h~parisc-use-unsigned-long-flags-in-semaphore-code include/asm-parisc/semaphore.h --- a/include/asm-parisc/semaphore.h~parisc-use-unsigned-long-flags-in-semaphore-code +++ a/include/asm-parisc/semaphore.h @@ -115,7 +115,8 @@ extern __inline__ int down_interruptible */ extern __inline__ int down_trylock(struct semaphore * sem) { - int flags, count; + unsigned long flags; + int count; spin_lock_irqsave(&sem->sentry, flags); count = sem->count - 1; @@ -131,7 +132,7 @@ extern __inline__ int down_trylock(struc */ extern __inline__ void up(struct semaphore * sem) { - int flags; + unsigned long flags; spin_lock_irqsave(&sem->sentry, flags); if (sem->count < 0) { __up(sem); _ Patches currently in -mm which might be from adobriyan@xxxxxxxxx are origin.patch oom-killer-meets-userspace-headers.patch lockd-endianness-annotations.patch kernel-nsproxyc-use-kmemdup.patch mtd-fix-comment-typo-devic.patch parisc-use-unsigned-long-flags-in-semaphore-code.patch config_pm=n-slim-drivers-pcmcia.patch i82092-wire-up-errors-from-pci_register_driver.patch megaraid-fix-warnings-when-config_proc_fs=n.patch scsi_libc-use-build_bug_on.patch git-wireless.patch paride-rename-pi_register-and-pi_unregister.patch paride_register-shuffle-return-values.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