The patch titled FRV: fix {dis,en}able_irq_lockdep_irqrestore compile error has been removed from the -mm tree. Its filename is lockdep-core-add-enable-disable_irq_irqsave-irqrestore-apis-frv-fix.patch This patch was dropped because it is obsolete ------------------------------------------------------ Subject: FRV: fix {dis,en}able_irq_lockdep_irqrestore compile error From: David Howells <dhowells@xxxxxxxxxx> Fix the lack of certain non-LOCKDEP stub functions in linux/interrupt.h and also provide FRV with LOCKDEP variants. This is to be applied to -mm kernel since not all of the functions added exist in the main kernel. Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Acked-by: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/asm-frv/irq.h | 44 ++++++++++++++++++++++++++++++++++++ include/linux/interrupt.h | 2 + 2 files changed, 46 insertions(+) diff -puN include/asm-frv/irq.h~lockdep-core-add-enable-disable_irq_irqsave-irqrestore-apis-frv-fix include/asm-frv/irq.h --- a/include/asm-frv/irq.h~lockdep-core-add-enable-disable_irq_irqsave-irqrestore-apis-frv-fix +++ a/include/asm-frv/irq.h @@ -30,4 +30,48 @@ static inline int irq_canonicalize(int i } #endif +#ifdef CONFIG_LOCKDEP +/* + * Special lockdep variants of irq disabling/enabling. + * These should be used for locking constructs that + * know that a particular irq context which is disabled, + * and which is the only irq-context user of a lock, + * that it's safe to take the lock in the irq-disabled + * section without disabling hardirqs. + * + * On !CONFIG_LOCKDEP they are equivalent to the normal + * irq disable/enable methods. + */ +static inline void disable_irq_nosync_lockdep(unsigned int irq) +{ + disable_irq_nosync(irq); + local_irq_disable(); +} + +static inline void disable_irq_nosync_lockdep_irqsave(unsigned int irq, + unsigned long *flags) +{ + disable_irq_nosync(irq); + local_irq_save(*flags); +} + +static inline void disable_irq_lockdep(unsigned int irq) +{ + disable_irq(irq); + local_irq_disable(); +} + +static inline void enable_irq_lockdep(unsigned int irq) +{ + local_irq_enable(); + enable_irq(irq); +} + +static inline void enable_irq_lockdep_irqrestore(unsigned int irq, + unsigned long *flags) +{ + local_irq_restore(*flags); + enable_irq(irq); +} +#endif /* CONFIG_LOCKDEP */ #endif /* _ASM_IRQ_H_ */ diff -puN include/linux/interrupt.h~lockdep-core-add-enable-disable_irq_irqsave-irqrestore-apis-frv-fix include/linux/interrupt.h --- a/include/linux/interrupt.h~lockdep-core-add-enable-disable_irq_irqsave-irqrestore-apis-frv-fix +++ a/include/linux/interrupt.h @@ -178,6 +178,8 @@ static inline int disable_irq_wake(unsig # define disable_irq_nosync_lockdep(irq) disable_irq_nosync(irq) # define disable_irq_lockdep(irq) disable_irq(irq) # define enable_irq_lockdep(irq) enable_irq(irq) +# define disable_irq_nosync_lockdep_irqsave(irq, flags) disable_irq_nosync(irq) +# define enable_irq_lockdep_irqrestore(irq, flags) enable_irq(irq) # endif #endif /* CONFIG_GENERIC_HARDIRQS */ _ Patches currently in -mm which might be from dhowells@xxxxxxxxxx are origin.patch git-block.patch git-block-hack.patch git-gfs2.patch git-nfs.patch nfs-replace-null-dentries-that-appear-in-readdirs-list-2.patch mm-tracking-shared-dirty-pages-nommu-fix-2.patch binfmt_elf-consistently-use-loff_t.patch frv-use-the-generic-irq-stuff.patch nommu-check-that-access_process_vm-has-a-valid-target.patch nommu-set-bdi-capabilities-for-dev-mem-and-dev-kmem.patch nommu-set-bdi-capabilities-for-dev-mem-and-dev-kmem-tidy.patch nommu-use-find_vma-rather-than-reimplementing-a-vma-search.patch check-if-start-address-is-in-vma-region-in-nommu-function-get_user_pages.patch nommu-check-vma-protections.patch nommu-permit-ptrace-to-ignore-non-prot_write-vmas-in-nommu-mode.patch nommu-implement-proc-pid-maps-for-nommu.patch nommu-order-the-per-mm_struct-vma-list.patch nommu-make-mremap-partially-work-for-nommu-kernels.patch nommu-add-docs-about-shared-memory.patch nommu-make-futexes-work-under-nommu-conditions.patch nommu-make-futexes-work-under-nommu-conditions-doc.patch nommu-move-the-fallback-arch_vma_name-to-a-sensible-place.patch afs-add-lock-annotations-to-afs_proc_cell_servers_startstop.patch elf_fdpic_core_dump-dont-take-tasklist_lock.patch simplify-update_times-avoid-jiffies-jiffies_64-aliasing-problem-2.patch lockdep-core-add-enable-disable_irq_irqsave-irqrestore-apis-frv-fix.patch lib-rwsemc-un-inline-rwsem_down_failed_common.patch kill-wall_jiffies.patch reiserfs-make-sure-all-dentries-refs-are-released-before-calling-kill_block_super-try-2.patch fs-cache-provide-a-filesystem-specific-syncable-page-bit.patch fs-cache-generic-filesystem-caching-facility.patch fs-cache-release-page-private-in-failed-readahead.patch fs-cache-release-page-private-after-failed-readahead-12.patch fs-cache-make-kafs-use-fs-cache.patch fs-cache-make-kafs-use-fs-cache-fix.patch fs-cache-make-kafs-use-fs-cache-12.patch fs-cache-make-kafs-use-fs-cache-12-fix.patch fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch nfs-use-local-caching.patch nfs-use-local-caching-12.patch nfs-use-local-caching-12-fix.patch fs-cache-cachefiles-ia64-missing-copy_page-export.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-cachefiles_write_page-shouldnt-indicate-error-twice.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-handle-enospc-on-create-mkdir-better.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-inode-count-maintenance.patch autofs-make-sure-all-dentries-refs-are-released-before-calling-kill_anon_super.patch vfs-destroy-the-dentries-contributed-by-a-superblock-on-unmounting.patch generic-ioremap_page_range-implementation-nommu-fix.patch vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers.patch vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-alpha-fix.patch nfs-represent-64-bit-fileids-as-64-bit-inode-numbers-on-32-bit-systems.patch ecryptfs-get_sb_dev-fix.patch ecryptfs-inode-numbering-fixes.patch introduce-kernel_execve.patch rename-the-provided-execve-functions-to-kernel_execve.patch provide-kernel_execve-on-all-architectures.patch provide-kernel_execve-on-all-architectures-fix.patch remove-the-use-of-_syscallx-macros-in-uml.patch sh64-remove-the-use-of-kernel-syscalls.patch remove-remaining-errno-and-__kernel_syscalls__-references.patch reiser4-get_sb_dev-fix.patch mutex-subsystem-synchro-test-module.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