The patch titled frv: fix irqs_disabled() to return an int, not an unsigned long has been removed from the -mm tree. Its filename was frv-fix-irqs_disabled-to-return-an-int-not-an-unsigned-long.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: frv: fix irqs_disabled() to return an int, not an unsigned long From: David Howells <dhowells@xxxxxxxxxx> Fix FRV irqs_disabled() to return an int, not an unsigned long to avoid this warning: kernel/sched.c: In function '__might_sleep': kernel/sched.c:8198: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-frv/system.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/asm-frv/system.h~frv-fix-irqs_disabled-to-return-an-int-not-an-unsigned-long include/asm-frv/system.h --- a/include/asm-frv/system.h~frv-fix-irqs_disabled-to-return-an-int-not-an-unsigned-long +++ a/include/asm-frv/system.h @@ -87,7 +87,7 @@ do { \ } while(0) #define irqs_disabled() \ - ({unsigned long flags; local_save_flags(flags); flags; }) + ({unsigned long flags; local_save_flags(flags); !!flags; }) #define local_irq_save(flags) \ do { \ _ Patches currently in -mm which might be from dhowells@xxxxxxxxxx are linux-next.patch acpi-fix-a-cast-of-a-32-bit-int-to-a-pointer.patch calgary-fix-a-comparison-warning-the-pci-calgary-64-driver.patch cifs-fix-range-check.patch sis-drm-fix-the-memory-allocator-if-the-sis-fb-is-built-as-a-module.patch sis-drm-fix-a-pointer-cast-warning.patch netfilter-fix-xt_times-time_mts-use-of-do_div.patch atm-fix-const-assignment-discard-warnings-in-the-atm-networking-driver.patch atm-fix-direct-casts-of-pointers-to-u32-in-the-interphase-driver.patch hysdn-remove-the-packed-attribute-from-poftimstamp_tag.patch sched-fix-inc_rt_tasks-to-not-declare-variable-rq-if-its-not-needed.patch git-unionfs.patch clocksource-fix-a-print-format-error-in-the-acpi-pm-clocksource-driver-and-check-range.patch pm-fix-try_to_freeze_taskss-use-of-do_div.patch mn10300-move-sg_dma_addresslen-to-asm-scatterlisth.patch inflate-refactor-inflate-malloc-code.patch inflate-refactor-inflate-malloc-code-checkpatch-fixes.patch pnpacpi-fix-pnpacpi_parse_irq_options-test-against-pnp_irq_nr.patch pnp-fix-the-fcpnp_driver-declaration-to-only-exist-if-config_pnp=y.patch include-asm-ptraceh-userspace-headers-cleanup.patch sdio-fix-break-control-to-now-return-success-or-an-error.patch mn10300-fix-mn10300s-serial-port-driver-to-get-at-its-tty_struct.patch ip2-fix-iielliscleanup-as-it-is-static-but-not-always-used.patch stallion-fix-the-istallion-drivers-putchar-and-break_ctl-ops.patch tsacct-fix-bacct_add_tsks-use-of-do_div.patch frv-use-the-common-ascii-hex-helpers.patch mn10300-use-the-common-ascii-hex-helpers.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