The patch titled m32r-fix-switch_to-macro-to-push-pop-frame-pointer-if-fix has been removed from the -mm tree. Its filename was m32r-fix-switch_to-macro-to-push-pop-frame-pointer-if-fix.patch This patch was dropped because it was folded into m32r-fix-switch_to-macro-to-push-pop-frame-pointer-if.patch ------------------------------------------------------ Subject: m32r-fix-switch_to-macro-to-push-pop-frame-pointer-if-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Hirokazu Takata <takata.hirokazu@xxxxxxxxxxx> Cc: Hirokazu Takata <takata@xxxxxxxxxxxxxx> Cc: Hitoshi Yamamoto <hitoshiy@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-m32r/system.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN include/asm-m32r/system.h~m32r-fix-switch_to-macro-to-push-pop-frame-pointer-if-fix include/asm-m32r/system.h --- a/include/asm-m32r/system.h~m32r-fix-switch_to-macro-to-push-pop-frame-pointer-if-fix +++ a/include/asm-m32r/system.h @@ -21,8 +21,8 @@ * `next' and `prev' should be struct task_struct, but it isn't always defined */ -#if defined(CONFIG_FRAME_POINTER) - || !defined(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER) +#if defined(CONFIG_FRAME_POINTER) || \ + !defined(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER) #define M32R_PUSH_FP " push fp\n" #define M32R_POP_FP " pop fp\n" #else _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch git-acpi-export-acpi_set_cstate_limit.patch git-alsa.patch working-3d-dri-intel-agpko-resume-for-i815-chip-tidy.patch git-avr32.patch fix-gregkh-driver-sysfs-fix-error-handling-in-binattr-write.patch cinergyt2-fix-file-release-handler.patch i2c-add-driver-for-dallas-ds1682-elapsed-time-recorder-fix.patch git-hid-fixup.patch sn-validate-smp_affinity-mask-on-intr-redirect-fix.patch sn-validate-smp_affinity-mask-on-intr-redirect-fix-2.patch sbp2-include-fixes.patch ieee1394-iso-needs-schedh.patch git-leds.patch git-leds-fixup.patch pata_acpi-restore-driver-vs-libata-clean-up-sff-init-mess-fix.patch git-battery.patch git-parisc.patch fix-gregkh-pci-pci-remove-the-broken-pci_multithread_probe-option.patch git-pciseg.patch scsi-fix-config_scsi_wait_scan=m.patch git-block-fixup.patch git-unionfs.patch auerswald-fix-file-release-handler.patch git-watchdog.patch git-wireless.patch git-wireless-fixup.patch i386-map-enough-initial-memory-to-create-lowmem-mappings-fix.patch i386-add-support-for-picopower-irq-router-fix.patch blacklist-dell-optiplex-320-from-using-the-hpet.patch x86_64-rename-and-export-bad_srat-to-kernel-code-fix.patch x86_64-extract-helper-function-from-e820_register_active_regions-fix.patch xfs-clean-up-shrinker-games.patch change-zonelist-order-v6-zonelist-fix.patch lazy-freeing-of-memory-through-madv_free.patch add-__gfp_movable-for-callers-to-flag-allocations-from-high-memory-that-may-be-migrated.patch group-short-lived-and-reclaimable-kernel-allocations-use-slab_account_reclaim-to-determine-when-__gfp_reclaimable-should-be-used-fix.patch bias-the-location-of-pages-freed-for-min_free_kbytes-in-the-same-max_order_nr_pages-blocks.patch mm-merge-populate-and-nopage-into-fault-fixes-nonlinear.patch mm-merge-nopfn-into-fault.patch maps2-move-the-page-walker-code-to-lib.patch maps2-add-proc-pid-pagemap-interface.patch fix-kthread_create-vs-freezer-theoretical-race.patch m32r-fix-switch_to-macro-to-push-pop-frame-pointer-if.patch m32r-fix-switch_to-macro-to-push-pop-frame-pointer-if-fix.patch cache-pipe-buf-page-address-for-non-highmem-arch.patch lib-hexdump.patch use-write_trylock_irqsave-in-ptrace_attach-fix.patch synclink_gt-add-compat_ioctl-fix.patch stop_machine-now-uses-hard_irq_disable-fix.patch add-lzo1x-compression-support-to-the-kernel-fix.patch tty-add-compat_ioctl.patch mpc52xx-psc-spi-master-driver-update-tidy.patch signal-timer-event-fds-v9-signalfd-core.patch signal-timer-event-fds-v9-timerfd-core.patch signal-timer-event-fds-v9-eventfd-core.patch revoke-wire-up-i386-system-calls.patch lguest-the-host-code.patch ntfs-use-zero_user_page.patch pm3fb-preliminary-24-to-26-port-fix.patch reiser4.patch integrity-new-hooks.patch integrity-evm-as-an-integrity-service-provider.patch integrity-ima-integrity_measure-support.patch integrity-tpm-internal-kernel-interface.patch w1-build-fix.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