Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel

author: Russell King <rmk@dyn-67.arm.linux.org.uk> 2006-09-27 14:57:54 -0400
committer: Russell King <rmk+kernel@arm.linux.org.uk> 2006-09-27 14:57:54 -0400
commit: 2dc94310bd94d0906febea7d0f7c188da620c952 (patch)
tree: 6de4096f1887e2c00966177354b1c378e59bd632 /arch/ppc/kernel/misc.S
parent: c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff)
parent: fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff)
1 files changed, 0 insertions, 88 deletions
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index 2fa0075f2b5f..50b4bbd06804 100644
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -768,91 +768,6 @@ _GLOBAL(_outsb)
        bdnz    00b
        blr
-_GLOBAL(_insw)
-        cmpwi   0,r5,0
-        mtctr   r5
-        subi    r4,r4,2
-        blelr-
-00:     lhbrx   r5,0,r3
-01:     eieio
-02:     sthu    r5,2(r4)
-        ISYNC_8xx
-        .section .fixup,"ax"
-03:     blr
-        .text
-        .section __ex_table, "a"
-                .align 2
-                .long 00b, 03b
-                .long 01b, 03b
-                .long 02b, 03b
-        .text
-        bdnz    00b
-        blr
-_GLOBAL(_outsw)
-        cmpwi   0,r5,0
-        mtctr   r5
-        subi    r4,r4,2
-        blelr-
-00:     lhzu    r5,2(r4)
-01:     eieio
-02:     sthbrx  r5,0,r3
-        ISYNC_8xx
-        .section .fixup,"ax"
-03:     blr
-        .text
-        .section __ex_table, "a"
-                .align 2
-                .long 00b, 03b
-                .long 01b, 03b
-                .long 02b, 03b
-        .text
-        bdnz    00b
-        blr
-_GLOBAL(_insl)
-        cmpwi   0,r5,0
-        mtctr   r5
-        subi    r4,r4,4
-        blelr-
-00:     lwbrx   r5,0,r3
-01:     eieio
-02:     stwu    r5,4(r4)
-        ISYNC_8xx
-        .section .fixup,"ax"
-03:     blr
-        .text
-        .section __ex_table, "a"
-                .align 2
-                .long 00b, 03b
-                .long 01b, 03b
-                .long 02b, 03b
-        .text
-        bdnz    00b
-        blr
-_GLOBAL(_outsl)
-        cmpwi   0,r5,0
-        mtctr   r5
-        subi    r4,r4,4
-        blelr-
-00:     lwzu    r5,4(r4)
-01:     stwbrx  r5,0,r3
-02:     eieio
-        ISYNC_8xx
-        .section .fixup,"ax"
-03:     blr
-        .text
-        .section __ex_table, "a"
-                .align 2
-                .long 00b, 03b
-                .long 01b, 03b
-                .long 02b, 03b
-        .text
-        bdnz    00b
-        blr
-_GLOBAL(__ide_mm_insw)
 _GLOBAL(_insw_ns)
        cmpwi   0,r5,0
        mtctr   r5
@@ -874,7 +789,6 @@ _GLOBAL(_insw_ns)
        bdnz    00b
        blr
-_GLOBAL(__ide_mm_outsw)
 _GLOBAL(_outsw_ns)
        cmpwi   0,r5,0
        mtctr   r5
@@ -896,7 +810,6 @@ _GLOBAL(_outsw_ns)
        bdnz    00b
        blr
-_GLOBAL(__ide_mm_insl)
 _GLOBAL(_insl_ns)
        cmpwi   0,r5,0
        mtctr   r5
@@ -918,7 +831,6 @@ _GLOBAL(_insl_ns)
        bdnz    00b
        blr
-_GLOBAL(__ide_mm_outsl)
 _GLOBAL(_outsl_ns)
        cmpwi   0,r5,0
        mtctr   r5
author	Russell King <rmk@dyn-67.arm.linux.org.uk>	2006-09-27 14:57:54 -0400
committer	Russell King <rmk+kernel@arm.linux.org.uk>	2006-09-27 14:57:54 -0400
commit	2dc94310bd94d0906febea7d0f7c188da620c952 (patch)
tree	6de4096f1887e2c00966177354b1c378e59bd632 /arch/ppc/kernel/misc.S
parent	c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff)
parent	fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff)

diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S index 2fa0075f2b5f..50b4bbd06804 100644 --- a/arch/ppc/kernel/misc.S +++ b/arch/ppc/kernel/misc.S
@@ -768,91 +768,6 @@ _GLOBAL(_outsb)
768	bdnz 00b	768	bdnz 00b
769	blr	769	blr
770		770
771	_GLOBAL(_insw)
772	cmpwi 0,r5,0
773	mtctr r5
774	subi r4,r4,2
775	blelr-
776	00: lhbrx r5,0,r3
777	01: eieio
778	02: sthu r5,2(r4)
779	ISYNC_8xx
780	.section .fixup,"ax"
781	03: blr
782	.text
783	.section __ex_table, "a"
784	.align 2
785	.long 00b, 03b
786	.long 01b, 03b
787	.long 02b, 03b
788	.text
789	bdnz 00b
790	blr
791
792	_GLOBAL(_outsw)
793	cmpwi 0,r5,0
794	mtctr r5
795	subi r4,r4,2
796	blelr-
797	00: lhzu r5,2(r4)
798	01: eieio
799	02: sthbrx r5,0,r3
800	ISYNC_8xx
801	.section .fixup,"ax"
802	03: blr
803	.text
804	.section __ex_table, "a"
805	.align 2
806	.long 00b, 03b
807	.long 01b, 03b
808	.long 02b, 03b
809	.text
810	bdnz 00b
811	blr
812
813	_GLOBAL(_insl)
814	cmpwi 0,r5,0
815	mtctr r5
816	subi r4,r4,4
817	blelr-
818	00: lwbrx r5,0,r3
819	01: eieio
820	02: stwu r5,4(r4)
821	ISYNC_8xx
822	.section .fixup,"ax"
823	03: blr
824	.text
825	.section __ex_table, "a"
826	.align 2
827	.long 00b, 03b
828	.long 01b, 03b
829	.long 02b, 03b
830	.text
831	bdnz 00b
832	blr
833
834	_GLOBAL(_outsl)
835	cmpwi 0,r5,0
836	mtctr r5
837	subi r4,r4,4
838	blelr-
839	00: lwzu r5,4(r4)
840	01: stwbrx r5,0,r3
841	02: eieio
842	ISYNC_8xx
843	.section .fixup,"ax"
844	03: blr
845	.text
846	.section __ex_table, "a"
847	.align 2
848	.long 00b, 03b
849	.long 01b, 03b
850	.long 02b, 03b
851	.text
852	bdnz 00b
853	blr
854
855	_GLOBAL(__ide_mm_insw)
856	_GLOBAL(_insw_ns)	771	_GLOBAL(_insw_ns)
857	cmpwi 0,r5,0	772	cmpwi 0,r5,0
858	mtctr r5	773	mtctr r5
@@ -874,7 +789,6 @@ _GLOBAL(_insw_ns)
874	bdnz 00b	789	bdnz 00b
875	blr	790	blr
876		791
877	_GLOBAL(__ide_mm_outsw)
878	_GLOBAL(_outsw_ns)	792	_GLOBAL(_outsw_ns)
879	cmpwi 0,r5,0	793	cmpwi 0,r5,0
880	mtctr r5	794	mtctr r5
@@ -896,7 +810,6 @@ _GLOBAL(_outsw_ns)
896	bdnz 00b	810	bdnz 00b
897	blr	811	blr
898		812
899	_GLOBAL(__ide_mm_insl)
900	_GLOBAL(_insl_ns)	813	_GLOBAL(_insl_ns)
901	cmpwi 0,r5,0	814	cmpwi 0,r5,0
902	mtctr r5	815	mtctr r5
@@ -918,7 +831,6 @@ _GLOBAL(_insl_ns)
918	bdnz 00b	831	bdnz 00b
919	blr	832	blr
920		833
921	_GLOBAL(__ide_mm_outsl)
922	_GLOBAL(_outsl_ns)	834	_GLOBAL(_outsl_ns)
923	cmpwi 0,r5,0	835	cmpwi 0,r5,0
924	mtctr r5	836	mtctr r5