diff options
Diffstat (limited to 'arch/parisc/kernel/pacache.S')
| -rw-r--r-- | arch/parisc/kernel/pacache.S | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index 36d7f402e48e..b743a80eaba0 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S | |||
| @@ -860,7 +860,7 @@ ENTRY(flush_dcache_page_asm) | |||
| 860 | #endif | 860 | #endif |
| 861 | 861 | ||
| 862 | ldil L%dcache_stride, %r1 | 862 | ldil L%dcache_stride, %r1 |
| 863 | ldw R%dcache_stride(%r1), %r1 | 863 | ldw R%dcache_stride(%r1), r31 |
| 864 | 864 | ||
| 865 | #ifdef CONFIG_64BIT | 865 | #ifdef CONFIG_64BIT |
| 866 | depdi,z 1, 63-PAGE_SHIFT,1, %r25 | 866 | depdi,z 1, 63-PAGE_SHIFT,1, %r25 |
| @@ -868,26 +868,26 @@ ENTRY(flush_dcache_page_asm) | |||
| 868 | depwi,z 1, 31-PAGE_SHIFT,1, %r25 | 868 | depwi,z 1, 31-PAGE_SHIFT,1, %r25 |
| 869 | #endif | 869 | #endif |
| 870 | add %r28, %r25, %r25 | 870 | add %r28, %r25, %r25 |
| 871 | sub %r25, %r1, %r25 | 871 | sub %r25, r31, %r25 |
| 872 | 872 | ||
| 873 | 873 | ||
| 874 | 1: fdc,m %r1(%r28) | 874 | 1: fdc,m r31(%r28) |
| 875 | fdc,m %r1(%r28) | 875 | fdc,m r31(%r28) |
| 876 | fdc,m %r1(%r28) | 876 | fdc,m r31(%r28) |
| 877 | fdc,m %r1(%r28) | 877 | fdc,m r31(%r28) |
| 878 | fdc,m %r1(%r28) | 878 | fdc,m r31(%r28) |
| 879 | fdc,m %r1(%r28) | 879 | fdc,m r31(%r28) |
| 880 | fdc,m %r1(%r28) | 880 | fdc,m r31(%r28) |
| 881 | fdc,m %r1(%r28) | 881 | fdc,m r31(%r28) |
| 882 | fdc,m %r1(%r28) | 882 | fdc,m r31(%r28) |
| 883 | fdc,m %r1(%r28) | 883 | fdc,m r31(%r28) |
| 884 | fdc,m %r1(%r28) | 884 | fdc,m r31(%r28) |
| 885 | fdc,m %r1(%r28) | 885 | fdc,m r31(%r28) |
| 886 | fdc,m %r1(%r28) | 886 | fdc,m r31(%r28) |
| 887 | fdc,m %r1(%r28) | 887 | fdc,m r31(%r28) |
| 888 | fdc,m %r1(%r28) | 888 | fdc,m r31(%r28) |
| 889 | cmpb,COND(<<) %r28, %r25,1b | 889 | cmpb,COND(<<) %r28, %r25,1b |
| 890 | fdc,m %r1(%r28) | 890 | fdc,m r31(%r28) |
| 891 | 891 | ||
| 892 | sync | 892 | sync |
| 893 | 893 | ||
| @@ -936,7 +936,7 @@ ENTRY(flush_icache_page_asm) | |||
| 936 | #endif | 936 | #endif |
| 937 | 937 | ||
| 938 | ldil L%icache_stride, %r1 | 938 | ldil L%icache_stride, %r1 |
| 939 | ldw R%icache_stride(%r1), %r1 | 939 | ldw R%icache_stride(%r1), %r31 |
| 940 | 940 | ||
| 941 | #ifdef CONFIG_64BIT | 941 | #ifdef CONFIG_64BIT |
| 942 | depdi,z 1, 63-PAGE_SHIFT,1, %r25 | 942 | depdi,z 1, 63-PAGE_SHIFT,1, %r25 |
| @@ -944,28 +944,28 @@ ENTRY(flush_icache_page_asm) | |||
| 944 | depwi,z 1, 31-PAGE_SHIFT,1, %r25 | 944 | depwi,z 1, 31-PAGE_SHIFT,1, %r25 |
| 945 | #endif | 945 | #endif |
| 946 | add %r28, %r25, %r25 | 946 | add %r28, %r25, %r25 |
| 947 | sub %r25, %r1, %r25 | 947 | sub %r25, %r31, %r25 |
| 948 | 948 | ||
| 949 | 949 | ||
| 950 | /* fic only has the type 26 form on PA1.1, requiring an | 950 | /* fic only has the type 26 form on PA1.1, requiring an |
| 951 | * explicit space specification, so use %sr4 */ | 951 | * explicit space specification, so use %sr4 */ |
| 952 | 1: fic,m %r1(%sr4,%r28) | 952 | 1: fic,m %r31(%sr4,%r28) |
| 953 | fic,m %r1(%sr4,%r28) | 953 | fic,m %r31(%sr4,%r28) |
| 954 | fic,m %r1(%sr4,%r28) | 954 | fic,m %r31(%sr4,%r28) |
| 955 | fic,m %r1(%sr4,%r28) | 955 | fic,m %r31(%sr4,%r28) |
| 956 | fic,m %r1(%sr4,%r28) | 956 | fic,m %r31(%sr4,%r28) |
| 957 | fic,m %r1(%sr4,%r28) | 957 | fic,m %r31(%sr4,%r28) |
| 958 | fic,m %r1(%sr4,%r28) | 958 | fic,m %r31(%sr4,%r28) |
| 959 | fic,m %r1(%sr4,%r28) | 959 | fic,m %r31(%sr4,%r28) |
| 960 | fic,m %r1(%sr4,%r28) | 960 | fic,m %r31(%sr4,%r28) |
| 961 | fic,m %r1(%sr4,%r28) | 961 | fic,m %r31(%sr4,%r28) |
| 962 | fic,m %r1(%sr4,%r28) | 962 | fic,m %r31(%sr4,%r28) |
| 963 | fic,m %r1(%sr4,%r28) | 963 | fic,m %r31(%sr4,%r28) |
| 964 | fic,m %r1(%sr4,%r28) | 964 | fic,m %r31(%sr4,%r28) |
| 965 | fic,m %r1(%sr4,%r28) | 965 | fic,m %r31(%sr4,%r28) |
| 966 | fic,m %r1(%sr4,%r28) | 966 | fic,m %r31(%sr4,%r28) |
| 967 | cmpb,COND(<<) %r28, %r25,1b | 967 | cmpb,COND(<<) %r28, %r25,1b |
| 968 | fic,m %r1(%sr4,%r28) | 968 | fic,m %r31(%sr4,%r28) |
| 969 | 969 | ||
| 970 | sync | 970 | sync |
| 971 | 971 | ||