The patch titled arch/arm26/kernel/entry.S: remove dead code has been removed from the -mm tree. Its filename was arch-arm26-kernel-entrys-remove-dead-code.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: arch/arm26/kernel/entry.S: remove dead code From: Adrian Bunk <bunk@xxxxxxxxx> CONFIG_ALIGNMENT_TRAP is never set on arm26. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Acked-by: Ian Molton <spyro@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm26/kernel/entry.S | 10 ---------- 1 file changed, 10 deletions(-) diff -puN arch/arm26/kernel/entry.S~arch-arm26-kernel-entrys-remove-dead-code arch/arm26/kernel/entry.S --- a/arch/arm26/kernel/entry.S~arch-arm26-kernel-entrys-remove-dead-code +++ a/arch/arm26/kernel/entry.S @@ -245,11 +245,6 @@ ENTRY(vector_swi) zero_fp get_scno -#ifdef CONFIG_ALIGNMENT_TRAP - ldr ip, __cr_alignment - ldr ip, [ip] - mcr p15, 0, ip, c1, c0 @ update control register -#endif enable_irqs ip str r4, [sp, #-S_OFF]! @ push fifth arg @@ -299,11 +294,6 @@ __sys_trace_return: b ret_slow_syscall .align 5 -#ifdef CONFIG_ALIGNMENT_TRAP - .type __cr_alignment, #object -__cr_alignment: - .word cr_alignment -#endif .type sys_call_table, #object ENTRY(sys_call_table) _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch git-drm.patch git-dvb.patch git-gfs2-nmw.patch git-ieee1394.patch kconfig-abort-configuration-with-recursive-dependencies.patch remove-fs-jffs2-ioctlc.patch git-ubi.patch drivers-net-vioc-possible-cleanups.patch net-uninline-skb_put-fix.patch drivers-scsi-small-cleanups.patch drivers-scsi-advansysc-cleanups.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-dpt_i2oc-remove-dead-code.patch drivers-scsi-aic7xxx-make-functions-static.patch drivers-scsi-wd33c93c-cleanups.patch drivers-scsi-qla4xxx-possible-cleanups.patch make-seagate_st0x_detect-static.patch drivers-scsi-aacraid-cleanups.patch remove-the-broken-scsi_acornscsi_3-driver.patch git-unionfs.patch git-wireless.patch git-ipwireless_cs.patch arch-i386-kernel-alternativec-should-include-asm-bugsh.patch make-struct-vmi_ops-static.patch i386-asm-offsetsc-workaround-for-a-wmissing-prototypes-warning.patch lguest-kconfig-and-headers-fix.patch proper-prototype-for-hugetlb_get_unmapped_area.patch mm-slabc-proper-prototypes.patch lumpy-reclaim-cleanup.patch filesystem-disk-errors-at-boot-time-caused-by-probe-fix.patch kill-net-rxrpc-rxrpc_symsc.patch drivers-char-hvc_consolec-cleanups.patch init-do_mountsc-proper-prepare_namespace-prototype.patch make-ext2_get_blocks-static.patch drivers-edac-make-code-static.patch linux-kernel-markers-kconfig-menus-fix.patch linux-kernel-markers-architecture-independant-code-license-fix.patch linux-kernel-markers-i386-optimization-export-fix.patch readahead-events-accounting-make-readahead_debug_level-static.patch reiser4-export-remove_from_page_cache-fix.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch fs-reiser4-possible-cleanups-2.patch fs-reiser4-more-possible-cleanups.patch slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch slim-debug-output-slm_set_taskperm-remove-horrible-error-handling-code.patch i386-enable-4k-stacks-by-default.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