git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
ppc
/
kernel
/
misc.S
diff --git
a/arch/ppc/kernel/misc.S
b/arch/ppc/kernel/misc.S
index
017da44
..
55ca736
100644
(file)
--- a/
arch/ppc/kernel/misc.S
+++ b/
arch/ppc/kernel/misc.S
@@
-214,7
+214,7
@@
_GLOBAL(low_choose_750fx_pll)
mtmsr r0
/* If switching to PLL1, disable HID0:BTIC */
mtmsr r0
/* If switching to PLL1, disable HID0:BTIC */
- cmpl
i
cr0,r3,0
+ cmpl
wi
cr0,r3,0
beq 1f
mfspr r5,HID0
rlwinm r5,r5,0,27,25
beq 1f
mfspr r5,HID0
rlwinm r5,r5,0,27,25
@@
-239,7
+239,7
@@
_GLOBAL(low_choose_750fx_pll)
stw r4,nap_save_hid1@l(r6)
/* If switching to PLL0, enable HID0:BTIC */
stw r4,nap_save_hid1@l(r6)
/* If switching to PLL0, enable HID0:BTIC */
- cmpl
i
cr0,r3,0
+ cmpl
wi
cr0,r3,0
bne 1f
mfspr r5,HID0
ori r5,r5,HID0_BTIC
bne 1f
mfspr r5,HID0
ori r5,r5,HID0_BTIC
@@
-470,7
+470,7
@@
_GLOBAL(_tlbia)
ori r9,r9,mmu_hash_lock@l
tophys(r9,r9)
10: lwarx r7,0,r9
ori r9,r9,mmu_hash_lock@l
tophys(r9,r9)
10: lwarx r7,0,r9
- cmp
i
0,r7,0
+ cmp
wi
0,r7,0
bne- 10b
stwcx. r8,0,r9
bne- 10b
bne- 10b
stwcx. r8,0,r9
bne- 10b
@@
-551,7
+551,7
@@
_GLOBAL(_tlbie)
ori r9,r9,mmu_hash_lock@l
tophys(r9,r9)
10: lwarx r7,0,r9
ori r9,r9,mmu_hash_lock@l
tophys(r9,r9)
10: lwarx r7,0,r9
- cmp
i
0,r7,0
+ cmp
wi
0,r7,0
bne- 10b
stwcx. r8,0,r9
bne- 10b
bne- 10b
stwcx. r8,0,r9
bne- 10b
@@
-599,7
+599,7
@@
_GLOBAL(flush_instruction_cache)
#else
mfspr r3,PVR
rlwinm r3,r3,16,16,31
#else
mfspr r3,PVR
rlwinm r3,r3,16,16,31
- cmp
i
0,r3,1
+ cmp
wi
0,r3,1
beqlr /* for 601, do nothing */
/* 603/604 processor - use invalidate-all bit in HID0 */
mfspr r3,HID0
beqlr /* for 601, do nothing */
/* 603/604 processor - use invalidate-all bit in HID0 */
mfspr r3,HID0
@@
-617,10
+617,9
@@
_GLOBAL(flush_instruction_cache)
* flush_icache_range(unsigned long start, unsigned long stop)
*/
_GLOBAL(flush_icache_range)
* flush_icache_range(unsigned long start, unsigned long stop)
*/
_GLOBAL(flush_icache_range)
- mfspr r5,PVR
- rlwinm r5,r5,16,16,31
- cmpi 0,r5,1
- beqlr /* for 601, do nothing */
+BEGIN_FTR_SECTION
+ blr /* for 601, do nothing */
+END_FTR_SECTION_IFSET(PPC_FEATURE_UNIFIED_CACHE)
li r5,L1_CACHE_LINE_SIZE-1
andc r3,r3,r5
subf r4,r3,r4
li r5,L1_CACHE_LINE_SIZE-1
andc r3,r3,r5
subf r4,r3,r4
@@
-735,10
+734,9
@@
_GLOBAL(flush_dcache_all)
* void __flush_dcache_icache(void *page)
*/
_GLOBAL(__flush_dcache_icache)
* void __flush_dcache_icache(void *page)
*/
_GLOBAL(__flush_dcache_icache)
- mfspr r5,PVR
- rlwinm r5,r5,16,16,31
- cmpi 0,r5,1
- beqlr /* for 601, do nothing */
+BEGIN_FTR_SECTION
+ blr /* for 601, do nothing */
+END_FTR_SECTION_IFSET(PPC_FEATURE_UNIFIED_CACHE)
rlwinm r3,r3,0,0,19 /* Get page base address */
li r4,4096/L1_CACHE_LINE_SIZE /* Number of lines in a page */
mtctr r4
rlwinm r3,r3,0,0,19 /* Get page base address */
li r4,4096/L1_CACHE_LINE_SIZE /* Number of lines in a page */
mtctr r4
@@
-764,10
+762,9
@@
_GLOBAL(__flush_dcache_icache)
* void __flush_dcache_icache_phys(unsigned long physaddr)
*/
_GLOBAL(__flush_dcache_icache_phys)
* void __flush_dcache_icache_phys(unsigned long physaddr)
*/
_GLOBAL(__flush_dcache_icache_phys)
- mfspr r5,PVR
- rlwinm r5,r5,16,16,31
- cmpi 0,r5,1
- beqlr /* for 601, do nothing */
+BEGIN_FTR_SECTION
+ blr /* for 601, do nothing */
+END_FTR_SECTION_IFSET(PPC_FEATURE_UNIFIED_CACHE)
mfmsr r10
rlwinm r0,r10,0,28,26 /* clear DR */
mtmsr r0
mfmsr r10
rlwinm r0,r10,0,28,26 /* clear DR */
mtmsr r0
@@
-1144,7
+1141,7
@@
_GLOBAL(kernel_thread)
li r4,0 /* new sp (unused) */
li r0,__NR_clone
sc
li r4,0 /* new sp (unused) */
li r0,__NR_clone
sc
- cmp
i
0,r3,0 /* parent or child? */
+ cmp
wi
0,r3,0 /* parent or child? */
bne 1f /* return if parent */
li r0,0 /* make top-level stack frame */
stwu r0,-16(r1)
bne 1f /* return if parent */
li r0,0 /* make top-level stack frame */
stwu r0,-16(r1)