]> git.pld-linux.org Git - packages/kernel.git/blame - kernel-ppc_asm_and_initializers-from-rc3-bk9.patch
projects / packages / kernel.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- more ppc assembler fixes
[packages/kernel.git] / kernel-ppc_asm_and_initializers-from-rc3-bk9.patch
CommitLineData
52abe9db 1diff -Nru a/arch/ppc/boot/common/util.S b/arch/ppc/boot/common/util.S
2--- a/arch/ppc/boot/common/util.S 2004-03-01 15:34:28 -08:00
3+++ b/arch/ppc/boot/common/util.S 2004-10-07 11:15:16 -07:00
4@@ -41,7 +41,7 @@
5 /* Test for a 601 */
6 mfpvr r10
7 srwi r10,r10,16
8- cmpi 0,r10,1 /* 601 ? */
9+ cmpwi 0,r10,1 /* 601 ? */
10 beq .clearbats_601
11
12 /* Clear BATs */
13@@ -117,9 +117,9 @@
14 /* Wait for the invalidation to complete */
15 mfspr r8,PVR
16 srwi r8,r8,16
17- cmpli cr0,r8,0x8000 /* 7450 */
18- cmpli cr1,r8,0x8001 /* 7455 */
19- cmpli cr2,r8,0x8002 /* 7457 */
20+ cmplwi cr0,r8,0x8000 /* 7450 */
21+ cmplwi cr1,r8,0x8001 /* 7455 */
22+ cmplwi cr2,r8,0x8002 /* 7457 */
23 cror 4*cr0+eq,4*cr0+eq,4*cr1+eq /* Now test if any are true. */
24 cror 4*cr0+eq,4*cr0+eq,4*cr2+eq
25 bne 2f
26@@ -190,7 +190,7 @@
27 udelay:
28 mfspr r4,PVR
29 srwi r4,r4,16
30- cmpi 0,r4,1 /* 601 ? */
31+ cmpwi 0,r4,1 /* 601 ? */
32 bne .udelay_not_601
33 00: li r0,86 /* Instructions / microsecond? */
34 mtctr r0
35@@ -213,16 +213,16 @@
36 1: mftbu r5
37 mftb r6
38 mftbu r7
39- cmp 0,r5,r7
40+ cmpw 0,r5,r7
41 bne 1b /* Get [synced] base time */
42 addc r9,r6,r4 /* Compute end time */
43 addze r8,r5
44 2: mftbu r5
45- cmp 0,r5,r8
46+ cmpw 0,r5,r8
47 blt 2b
48 bgt 3f
49 mftb r6
50- cmp 0,r6,r9
51+ cmpw 0,r6,r9
52 blt 2b
53 3: blr
54
55diff -Nru a/arch/ppc/boot/openfirmware/misc.S b/arch/ppc/boot/openfirmware/misc.S
56--- a/arch/ppc/boot/openfirmware/misc.S 2003-08-25 05:13:38 -07:00
57+++ b/arch/ppc/boot/openfirmware/misc.S 2004-10-07 12:17:53 -07:00
58@@ -16,7 +16,7 @@
59 setup_bats:
60 mfpvr 5
61 rlwinm 5,5,16,16,31 /* r3 = 1 for 601, 4 for 604 */
62- cmpi 0,5,1
63+ cmpwi 0,5,1
64 li 0,0
65 bne 4f
66 mtibatl 3,0 /* invalidate BAT first */
67diff -Nru a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c
68--- a/arch/ppc/boot/simple/misc.c 2004-09-07 23:33:06 -07:00
69+++ b/arch/ppc/boot/simple/misc.c 2004-10-08 02:57:32 -07:00
70@@ -94,7 +94,7 @@
71 #endif
72 char *cp;
73 struct bi_record *rec;
74- unsigned long initrd_loc, TotalMemory = 0;
75+ unsigned long initrd_loc = 0, TotalMemory = 0;
76
77 #ifdef CONFIG_SERIAL_8250_CONSOLE
78 com_port = serial_init(0, NULL);
79diff -Nru a/arch/ppc/boot/simple/relocate.S b/arch/ppc/boot/simple/relocate.S
80--- a/arch/ppc/boot/simple/relocate.S 2004-04-02 19:13:47 -08:00
81+++ b/arch/ppc/boot/simple/relocate.S 2004-10-07 12:17:13 -07:00
82@@ -50,7 +50,7 @@
83 * Check if we need to relocate ourselves to the link addr or were
84 * we loaded there to begin with.
85 */
86- cmp cr0,r3,r4
87+ cmpw cr0,r3,r4
88 beq start_ldr /* If 0, we don't need to relocate */
89
90 /* Move this code somewhere safe. This is max(load + size, end)
91@@ -122,7 +122,7 @@
92 GETSYM(r4, start)
93 mr r3,r8 /* Get the load addr */
94
95- cmp cr0,r4,r3 /* If we need to copy from the end, do so */
96+ cmpw cr0,r4,r3 /* If we need to copy from the end, do so */
97 bgt do_relocate_from_end
98
99 do_relocate_from_start:
100@@ -165,7 +165,7 @@
101 subi r4,r4,4
102 li r0,0
103 50: stwu r0,4(r3)
104- cmp cr0,r3,r4
105+ cmpw cr0,r3,r4
106 bne 50b
107 90: mr r9,r1 /* Save old stack pointer (in case it matters) */
108 lis r1,.stack@h
109diff -Nru a/arch/ppc/kernel/cpu_setup_6xx.S b/arch/ppc/kernel/cpu_setup_6xx.S
110--- a/arch/ppc/kernel/cpu_setup_6xx.S 2004-08-26 02:16:36 -07:00
111+++ b/arch/ppc/kernel/cpu_setup_6xx.S 2004-10-07 09:45:55 -07:00
112@@ -172,9 +172,9 @@
113 setup_750cx:
114 mfspr r10, SPRN_HID1
115 rlwinm r10,r10,4,28,31
116- cmpi cr0,r10,7
117- cmpi cr1,r10,9
118- cmpi cr2,r10,11
119+ cmpwi cr0,r10,7
120+ cmpwi cr1,r10,9
121+ cmpwi cr2,r10,11
122 cror 4*cr0+eq,4*cr0+eq,4*cr1+eq
123 cror 4*cr0+eq,4*cr0+eq,4*cr2+eq
124 bnelr
125@@ -287,12 +287,12 @@
126 /* Now deal with CPU type dependent registers */
127 mfspr r3,PVR
128 srwi r3,r3,16
129- cmpli cr0,r3,0x8000 /* 7450 */
130- cmpli cr1,r3,0x000c /* 7400 */
131- cmpli cr2,r3,0x800c /* 7410 */
132- cmpli cr3,r3,0x8001 /* 7455 */
133- cmpli cr4,r3,0x8002 /* 7457 */
134- cmpli cr5,r3,0x7000 /* 750FX */
135+ cmplwi cr0,r3,0x8000 /* 7450 */
136+ cmplwi cr1,r3,0x000c /* 7400 */
137+ cmplwi cr2,r3,0x800c /* 7410 */
138+ cmplwi cr3,r3,0x8001 /* 7455 */
139+ cmplwi cr4,r3,0x8002 /* 7457 */
140+ cmplwi cr5,r3,0x7000 /* 750FX */
141 /* cr1 is 7400 || 7410 */
142 cror 4*cr1+eq,4*cr1+eq,4*cr2+eq
143 /* cr0 is 74xx */
144@@ -323,7 +323,7 @@
145 /* If rev 2.x, backup HID2 */
146 mfspr r3,PVR
147 andi. r3,r3,0xff00
148- cmpi cr0,r3,0x0200
149+ cmpwi cr0,r3,0x0200
150 bne 1f
151 mfspr r4,SPRN_HID2
152 stw r4,CS_HID2(r5)
153@@ -354,12 +354,12 @@
154 /* Now deal with CPU type dependent registers */
155 mfspr r3,PVR
156 srwi r3,r3,16
157- cmpli cr0,r3,0x8000 /* 7450 */
158- cmpli cr1,r3,0x000c /* 7400 */
159- cmpli cr2,r3,0x800c /* 7410 */
160- cmpli cr3,r3,0x8001 /* 7455 */
161- cmpli cr4,r3,0x8002 /* 7457 */
162- cmpli cr5,r3,0x7000 /* 750FX */
163+ cmplwi cr0,r3,0x8000 /* 7450 */
164+ cmplwi cr1,r3,0x000c /* 7400 */
165+ cmplwi cr2,r3,0x800c /* 7410 */
166+ cmplwi cr3,r3,0x8001 /* 7455 */
167+ cmplwi cr4,r3,0x8002 /* 7457 */
168+ cmplwi cr5,r3,0x7000 /* 750FX */
169 /* cr1 is 7400 || 7410 */
170 cror 4*cr1+eq,4*cr1+eq,4*cr2+eq
171 /* cr0 is 74xx */
172@@ -412,7 +412,7 @@
173 /* If rev 2.x, restore HID2 with low voltage bit cleared */
174 mfspr r3,PVR
175 andi. r3,r3,0xff00
176- cmpi cr0,r3,0x0200
177+ cmpwi cr0,r3,0x0200
178 bne 4f
179 lwz r4,CS_HID2(r5)
180 rlwinm r4,r4,0,19,17
181@@ -426,7 +426,7 @@
182 mftbl r5
183 3: mftbl r6
184 sub r6,r6,r5
185- cmpli cr0,r6,10000
186+ cmplwi cr0,r6,10000
187 ble 3b
188 /* Setup final PLL */
189 mtspr SPRN_HID1,r4
190diff -Nru a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S
191--- a/arch/ppc/kernel/entry.S 2004-06-17 23:41:08 -07:00
192+++ b/arch/ppc/kernel/entry.S 2004-10-07 09:11:33 -07:00
193@@ -206,7 +206,7 @@
194 andi. r11,r11,_TIF_SYSCALL_TRACE
195 bne- syscall_dotrace
196 syscall_dotrace_cont:
197- cmpli 0,r0,NR_syscalls
198+ cmplwi 0,r0,NR_syscalls
199 lis r10,sys_call_table@h
200 ori r10,r10,sys_call_table@l
201 slwi r0,r0,2
202@@ -222,7 +222,7 @@
203 #endif
204 mr r6,r3
205 li r11,-_LAST_ERRNO
206- cmpl 0,r3,r11
207+ cmplw 0,r3,r11
208 rlwinm r12,r1,0,0,18 /* current_thread_info() */
209 blt+ 30f
210 lwz r11,TI_LOCAL_FLAGS(r12)
211diff -Nru a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S
212--- a/arch/ppc/kernel/head.S 2004-07-26 15:12:27 -07:00
213+++ b/arch/ppc/kernel/head.S 2004-10-07 09:46:47 -07:00
214@@ -800,7 +800,7 @@
215 tophys(r6,0) /* get __pa constant */
216 addis r3,r6,last_task_used_math@ha
217 lwz r4,last_task_used_math@l(r3)
218- cmpi 0,r4,0
219+ cmpwi 0,r4,0
220 beq 1f
221 add r4,r4,r6
222 addi r4,r4,THREAD /* want last_task_used_math->thread */
223@@ -927,7 +927,7 @@
224 tophys(r6,0)
225 addis r3,r6,last_task_used_altivec@ha
226 lwz r4,last_task_used_altivec@l(r3)
227- cmpi 0,r4,0
228+ cmpwi 0,r4,0
229 beq 1f
230 add r4,r4,r6
231 addi r4,r4,THREAD /* want THREAD of last_task_used_altivec */
232@@ -992,11 +992,11 @@
233 SYNC
234 MTMSRD(r5) /* enable use of AltiVec now */
235 isync
236- cmpi 0,r3,0
237+ cmpwi 0,r3,0
238 beqlr- /* if no previous owner, done */
239 addi r3,r3,THREAD /* want THREAD of task */
240 lwz r5,PT_REGS(r3)
241- cmpi 0,r5,0
242+ cmpwi 0,r5,0
243 SAVE_32VR(0, r4, r3)
244 mfvscr vr0
245 li r4,THREAD_VSCR
246@@ -1030,11 +1030,11 @@
247 MTMSRD(r5) /* enable use of fpu now */
248 SYNC_601
249 isync
250- cmpi 0,r3,0
251+ cmpwi 0,r3,0
252 beqlr- /* if no previous owner, done */
253 addi r3,r3,THREAD /* want THREAD of task */
254 lwz r5,PT_REGS(r3)
255- cmpi 0,r5,0
256+ cmpwi 0,r5,0
257 SAVE_32FPRS(0, r3)
258 mffs fr0
259 stfd fr0,THREAD_FPSCR-4(r3)
260@@ -1539,7 +1539,7 @@
261 #ifndef CONFIG_PPC64BRIDGE
262 mfspr r9,PVR
263 rlwinm r9,r9,16,16,31 /* r9 = 1 for 601, 4 for 604 */
264- cmpi 0,r9,1
265+ cmpwi 0,r9,1
266 bne 4f
267 ori r11,r11,4 /* set up BAT registers for 601 */
268 li r8,0x7f /* valid, block length = 8MB */
269@@ -1591,7 +1591,7 @@
270 lwz r8,4(r8)
271 mfspr r9,PVR
272 rlwinm r9,r9,16,16,31 /* r9 = 1 for 601, 4 for 604 */
273- cmpi 0,r9,1
274+ cmpwi 0,r9,1
275 beq 1f
276 mtspr DBAT3L,r8
277 mtspr DBAT3U,r11
6f115be7 278diff -Nru a/arch/ppc/kernel/head_e500.S b/arch/ppc/kernel/head_e500.S
279--- a/arch/ppc/kernel/head_e500.S 2004-10-10 21:13:08.000000000 +0200
280+++ b/arch/ppc/kernel/head_e500.S 2004-10-10 21:13:08.000000000 +0200
281@@ -1057,7 +1057,7 @@
282 #ifndef CONFIG_SMP
283 lis r3,last_task_used_spe@ha
284 lwz r4,last_task_used_spe@l(r3)
285- cmpi 0,r4,0
286+ cmpwi 0,r4,0
287 beq 1f
288 addi r4,r4,THREAD /* want THREAD of last_task_used_spe */
289 SAVE_32EVR(0,r10,r4)
290@@ -1167,11 +1167,11 @@
291 SYNC
292 mtmsr r5 /* enable use of SPE now */
293 isync
294- cmpi 0,r3,0
295+ cmpwi 0,r3,0
296 beqlr- /* if no previous owner, done */
297 addi r3,r3,THREAD /* want THREAD of task */
298 lwz r5,PT_REGS(r3)
299- cmpi 0,r5,0
300+ cmpwi 0,r5,0
301 SAVE_32EVR(0, r4, r3)
302 evxor evr6, evr6, evr6 /* clear out evr6 */
303 evmwumiaa evr6, evr6, evr6 /* evr6 <- ACC = 0 * 0 + ACC */
52abe9db 304diff -Nru a/arch/ppc/kernel/idle_6xx.S b/arch/ppc/kernel/idle_6xx.S
305--- a/arch/ppc/kernel/idle_6xx.S 2003-09-22 17:12:45 -07:00
306+++ b/arch/ppc/kernel/idle_6xx.S 2004-10-07 09:47:04 -07:00
307@@ -79,12 +79,12 @@
308 /* Now check if user or arch enabled NAP mode */
309 lis r4,powersave_nap@ha
310 lwz r4,powersave_nap@l(r4)
311- cmpi 0,r4,0
312+ cmpwi 0,r4,0
313 beq 1f
314 lis r3,HID0_NAP@h
315 1:
316 END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
317- cmpi 0,r3,0
318+ cmpwi 0,r3,0
319 beqlr
320
321 /* Clear MSR:EE */
322@@ -133,7 +133,7 @@
323 /* Go to low speed mode on some 750FX */
324 lis r4,powersave_lowspeed@ha
325 lwz r4,powersave_lowspeed@l(r4)
326- cmpi 0,r4,0
327+ cmpwi 0,r4,0
328 beq 1f
329 mfspr r4,SPRN_HID1
330 oris r4,r4,0x0001
331diff -Nru a/arch/ppc/kernel/idle_power4.S b/arch/ppc/kernel/idle_power4.S
332--- a/arch/ppc/kernel/idle_power4.S 2004-02-04 19:44:27 -08:00
333+++ b/arch/ppc/kernel/idle_power4.S 2004-10-07 09:47:13 -07:00
334@@ -56,7 +56,7 @@
335 /* Now check if user or arch enabled NAP mode */
336 lis r4,powersave_nap@ha
337 lwz r4,powersave_nap@l(r4)
338- cmpi 0,r4,0
339+ cmpwi 0,r4,0
340 beqlr
341
342 /* Clear MSR:EE */
343diff -Nru a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
344--- a/arch/ppc/kernel/misc.S 2004-08-17 10:42:55 -07:00
345+++ b/arch/ppc/kernel/misc.S 2004-10-07 09:45:17 -07:00
346@@ -214,7 +214,7 @@
347 mtmsr r0
348
349 /* If switching to PLL1, disable HID0:BTIC */
350- cmpli cr0,r3,0
351+ cmplwi cr0,r3,0
352 beq 1f
353 mfspr r5,HID0
354 rlwinm r5,r5,0,27,25
355@@ -239,7 +239,7 @@
356 stw r4,nap_save_hid1@l(r6)
357
358 /* If switching to PLL0, enable HID0:BTIC */
359- cmpli cr0,r3,0
360+ cmplwi cr0,r3,0
361 bne 1f
362 mfspr r5,HID0
363 ori r5,r5,HID0_BTIC
364@@ -470,7 +470,7 @@
365 ori r9,r9,mmu_hash_lock@l
366 tophys(r9,r9)
367 10: lwarx r7,0,r9
368- cmpi 0,r7,0
369+ cmpwi 0,r7,0
370 bne- 10b
371 stwcx. r8,0,r9
372 bne- 10b
373@@ -551,7 +551,7 @@
374 ori r9,r9,mmu_hash_lock@l
375 tophys(r9,r9)
376 10: lwarx r7,0,r9
377- cmpi 0,r7,0
378+ cmpwi 0,r7,0
379 bne- 10b
380 stwcx. r8,0,r9
381 bne- 10b
382@@ -599,7 +599,7 @@
383 #else
384 mfspr r3,PVR
385 rlwinm r3,r3,16,16,31
386- cmpi 0,r3,1
387+ cmpwi 0,r3,1
388 beqlr /* for 601, do nothing */
389 /* 603/604 processor - use invalidate-all bit in HID0 */
390 mfspr r3,HID0
6f115be7 391@@ -619,7 +619,7 @@
392 _GLOBAL(flush_icache_range)
393 mfspr r5,PVR
394 rlwinm r5,r5,16,16,31
395- cmpi 0,r5,1
396+ cmpwi 0,r5,1
397 beqlr /* for 601, do nothing */
398 li r5,L1_CACHE_LINE_SIZE-1
399 andc r3,r3,r5
400@@ -737,7 +737,7 @@
401 _GLOBAL(__flush_dcache_icache)
402 mfspr r5,PVR
403 rlwinm r5,r5,16,16,31
404- cmpi 0,r5,1
405+ cmpwi 0,r5,1
406 beqlr /* for 601, do nothing */
407 rlwinm r3,r3,0,0,19 /* Get page base address */
408 li r4,4096/L1_CACHE_LINE_SIZE /* Number of lines in a page */
409@@ -766,7 +766,7 @@
410 _GLOBAL(__flush_dcache_icache_phys)
411 mfspr r5,PVR
412 rlwinm r5,r5,16,16,31
413- cmpi 0,r5,1
414+ cmpwi 0,r5,1
415 beqlr /* for 601, do nothing */
416 mfmsr r10
417 rlwinm r0,r10,0,28,26 /* clear DR */
52abe9db 418@@ -1141,7 +1141,7 @@
419 li r4,0 /* new sp (unused) */
420 li r0,__NR_clone
421 sc
422- cmpi 0,r3,0 /* parent or child? */
423+ cmpwi 0,r3,0 /* parent or child? */
424 bne 1f /* return if parent */
425 li r0,0 /* make top-level stack frame */
426 stwu r0,-16(r1)
427diff -Nru a/arch/ppc/kernel/signal.c b/arch/ppc/kernel/signal.c
428--- a/arch/ppc/kernel/signal.c 2004-08-25 10:13:41 -07:00
429+++ b/arch/ppc/kernel/signal.c 2004-10-05 23:05:22 -07:00
430@@ -270,7 +270,7 @@
431 static int
432 restore_user_regs(struct pt_regs *regs, struct mcontext __user *sr, int sig)
433 {
434- unsigned long save_r2;
435+ unsigned long save_r2 = 0;
436 #if defined(CONFIG_ALTIVEC) || defined(CONFIG_SPE)
437 unsigned long msr;
438 #endif
439diff -Nru a/arch/ppc/lib/checksum.S b/arch/ppc/lib/checksum.S
440--- a/arch/ppc/lib/checksum.S 2002-09-15 21:51:59 -07:00
441+++ b/arch/ppc/lib/checksum.S 2004-10-07 09:13:16 -07:00
442@@ -80,13 +80,13 @@
443 adde r0,r0,r5 /* be unnecessary to unroll this loop */
444 bdnz 2b
445 andi. r4,r4,3
446-3: cmpi 0,r4,2
447+3: cmpwi 0,r4,2
448 blt+ 4f
449 lhz r5,4(r3)
450 addi r3,r3,2
451 subi r4,r4,2
452 adde r0,r0,r5
453-4: cmpi 0,r4,1
454+4: cmpwi 0,r4,1
455 bne+ 5f
456 lbz r5,4(r3)
457 slwi r5,r5,8 /* Upper byte of word */
458@@ -143,7 +143,7 @@
459 adde r0,r0,r9
460 bdnz 82b
461 13: andi. r5,r5,3
462-3: cmpi 0,r5,2
463+3: cmpwi 0,r5,2
464 blt+ 4f
465 83: lhz r6,4(r3)
466 addi r3,r3,2
467@@ -151,7 +151,7 @@
468 93: sth r6,4(r4)
469 addi r4,r4,2
470 adde r0,r0,r6
471-4: cmpi 0,r5,1
472+4: cmpwi 0,r5,1
473 bne+ 5f
474 84: lbz r6,4(r3)
475 94: stb r6,4(r4)
476@@ -188,7 +188,7 @@
477 97: stbu r6,1(r4)
478 bdnz 97b
479 src_error:
480- cmpi 0,r7,0
481+ cmpwi 0,r7,0
482 beq 1f
483 li r6,-EFAULT
484 stw r6,0(r7)
485@@ -196,7 +196,7 @@
486 blr
487
488 dst_error:
489- cmpi 0,r8,0
490+ cmpwi 0,r8,0
491 beq 1f
492 li r6,-EFAULT
493 stw r6,0(r8)
494diff -Nru a/arch/ppc/mm/44x_mmu.c b/arch/ppc/mm/44x_mmu.c
495--- a/arch/ppc/mm/44x_mmu.c 2004-08-07 11:05:38 -07:00
496+++ b/arch/ppc/mm/44x_mmu.c 2004-10-05 23:05:22 -07:00
497@@ -72,7 +72,7 @@
498 static void __init
499 ppc44x_pin_tlb(int slot, unsigned int virt, unsigned int phys)
500 {
501- unsigned long attrib;
502+ unsigned long attrib = 0;
503
504 __asm__ __volatile__("\
505 clrrwi %2,%2,10\n\
506diff -Nru a/arch/ppc/platforms/pmac_pci.c b/arch/ppc/platforms/pmac_pci.c
507--- a/arch/ppc/platforms/pmac_pci.c 2004-09-28 21:05:15 -07:00
508+++ b/arch/ppc/platforms/pmac_pci.c 2004-08-16 21:18:09 -07:00
509@@ -316,6 +316,10 @@
510 unsigned int addr;
511 int i;
512
513+ struct device_node *np = pci_busdev_to_OF_node(bus, devfn);
514+ if (np == NULL)
515+ return PCIBIOS_DEVICE_NOT_FOUND;
516+
517 /*
518 * When a device in K2 is powered down, we die on config
519 * cycle accesses. Fix that here.
520@@ -363,6 +367,9 @@
521 unsigned int addr;
522 int i;
523
524+ struct device_node *np = pci_busdev_to_OF_node(bus, devfn);
525+ if (np == NULL)
526+ return PCIBIOS_DEVICE_NOT_FOUND;
527 /*
528 * When a device in K2 is powered down, we die on config
529 * cycle accesses. Fix that here.
530diff -Nru a/arch/ppc/syslib/ppc4xx_pic.c b/arch/ppc/syslib/ppc4xx_pic.c
531--- a/arch/ppc/syslib/ppc4xx_pic.c 2004-07-01 22:23:47 -07:00
532+++ b/arch/ppc/syslib/ppc4xx_pic.c 2004-10-05 23:05:22 -07:00
533@@ -256,7 +256,7 @@
534 ppc4xx_uic_end(unsigned int irq)
535 {
536 int bit, word;
537- unsigned int tr_bits;
538+ unsigned int tr_bits = 0;
539
540 bit = irq & 0x1f;
541 word = irq >> 5;
542diff -Nru a/arch/ppc/syslib/todc_time.c b/arch/ppc/syslib/todc_time.c
543--- a/arch/ppc/syslib/todc_time.c 2004-03-02 10:54:26 -08:00
544+++ b/arch/ppc/syslib/todc_time.c 2004-10-05 23:05:22 -07:00
545@@ -277,9 +277,9 @@
546 ulong
547 todc_get_rtc_time(void)
548 {
549- uint year, mon, day, hour, min, sec;
550+ uint year = 0, mon = 0, day = 0, hour = 0, min = 0, sec = 0;
551 uint limit, i;
552- u_char save_control, uip;
553+ u_char save_control, uip = 0;
554
555 spin_lock(&rtc_lock);
556 save_control = todc_read_val(todc_info->control_a);
557@@ -361,7 +361,7 @@
558 todc_set_rtc_time(unsigned long nowtime)
559 {
560 struct rtc_time tm;
561- u_char save_control, save_freq_select;
562+ u_char save_control, save_freq_select = 0;
563
564 spin_lock(&rtc_lock);
565 to_tm(nowtime, &tm);
566@@ -416,7 +416,7 @@
567 */
568 static unsigned char __init todc_read_timereg(int addr)
569 {
570- unsigned char save_control, val;
571+ unsigned char save_control = 0, val;
572
573 switch (todc_info->rtc_type) {
574 case TODC_TYPE_DS1557:
575diff -Nru a/arch/ppc64/kernel/ItLpQueue.c b/arch/ppc64/kernel/ItLpQueue.c
576--- a/arch/ppc64/kernel/ItLpQueue.c 2004-07-01 22:23:46 -07:00
577+++ b/arch/ppc64/kernel/ItLpQueue.c 2004-10-07 11:48:51 -07:00
578@@ -25,7 +25,7 @@
579
580 __asm__ __volatile__("\n\
581 1: lwarx %0,0,%2 \n\
582- cmpi 0,%0,0 \n\
583+ cmpwi 0,%0,0 \n\
584 li %0,0 \n\
585 bne- 2f \n\
586 addi %0,%0,1 \n\
587diff -Nru a/arch/ppc64/kernel/entry.S b/arch/ppc64/kernel/entry.S
588--- a/arch/ppc64/kernel/entry.S 2004-09-21 00:22:33 -07:00
589+++ b/arch/ppc64/kernel/entry.S 2004-10-07 14:52:16 -07:00
590@@ -122,7 +122,7 @@
591 andi. r11,r10,_TIF_SYSCALL_T_OR_A
592 bne- syscall_dotrace
593 syscall_dotrace_cont:
594- cmpli 0,r0,NR_syscalls
595+ cmpldi 0,r0,NR_syscalls
596 bge- syscall_enosys
597
598 system_call: /* label this so stack traces look sane */
599@@ -204,7 +204,7 @@
600
601 syscall_error:
602 lbz r11,TI_SC_NOERR(r12)
603- cmpi 0,r11,0
604+ cmpwi 0,r11,0
605 bne- syscall_error_cont
606 neg r3,r3
607 oris r5,r5,0x1000 /* Set SO bit in CR */
608diff -Nru a/arch/ppc64/kernel/idle_power4.S b/arch/ppc64/kernel/idle_power4.S
609--- a/arch/ppc64/kernel/idle_power4.S 2004-02-11 19:47:50 -08:00
610+++ b/arch/ppc64/kernel/idle_power4.S 2004-10-07 14:52:16 -07:00
611@@ -46,7 +46,7 @@
612 /* Now check if user or arch enabled NAP mode */
613 LOADBASE(r3,powersave_nap)
614 lwz r4,powersave_nap@l(r3)
615- cmpi 0,r4,0
616+ cmpwi 0,r4,0
617 beqlr
618
619 /* Clear MSR:EE */
620diff -Nru a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S
621--- a/arch/ppc64/kernel/misc.S 2004-09-26 22:36:58 -07:00
622+++ b/arch/ppc64/kernel/misc.S 2004-10-07 14:52:16 -07:00
623@@ -670,7 +670,7 @@
624 li r4,0 /* new sp (unused) */
625 li r0,__NR_clone
626 sc
627- cmpi 0,r3,0 /* parent or child? */
628+ cmpdi 0,r3,0 /* parent or child? */
629 bne 1f /* return if parent */
630 li r0,0
631 stdu r0,-STACK_FRAME_OVERHEAD(r1)
632diff -Nru a/arch/ppc64/lib/checksum.S b/arch/ppc64/lib/checksum.S
633--- a/arch/ppc64/lib/checksum.S 2002-09-17 16:32:53 -07:00
634+++ b/arch/ppc64/lib/checksum.S 2004-10-07 15:38:13 -07:00
635@@ -92,19 +92,19 @@
636 adde r5,r5,r6
637 bdnz 2b
638 andi. r4,r4,7 /* compute bytes left to sum after doublewords */
639-3: cmpi 0,r4,4 /* is at least a full word left? */
640+3: cmpwi 0,r4,4 /* is at least a full word left? */
641 blt 4f
642 lwz r6,8(r3) /* sum this word */
643 addi r3,r3,4
644 subi r4,r4,4
645 adde r5,r5,r6
646-4: cmpi 0,r4,2 /* is at least a halfword left? */
647+4: cmpwi 0,r4,2 /* is at least a halfword left? */
648 blt+ 5f
649 lhz r6,8(r3) /* sum this halfword */
650 addi r3,r3,2
651 subi r4,r4,2
652 adde r5,r5,r6
653-5: cmpi 0,r4,1 /* is at least a byte left? */
654+5: cmpwi 0,r4,1 /* is at least a byte left? */
655 bne+ 6f
656 lbz r6,8(r3) /* sum this byte */
657 slwi r6,r6,8 /* this byte is assumed to be the upper byte of a halfword */
658@@ -150,7 +150,7 @@
659 adde r0,r0,r6
660 bdnz 82b
661 andi. r5,r5,3
662-3: cmpi 0,r5,2
663+3: cmpwi 0,r5,2
664 blt+ 4f
665 83: lhz r6,4(r3)
666 addi r3,r3,2
667@@ -158,7 +158,7 @@
668 93: sth r6,4(r4)
669 addi r4,r4,2
670 adde r0,r0,r6
671-4: cmpi 0,r5,1
672+4: cmpwi 0,r5,1
673 bne+ 5f
674 84: lbz r6,4(r3)
675 94: stb r6,4(r4)
676@@ -198,7 +198,7 @@
677 bdnz 97b
678 .globl src_error
679 src_error:
680- cmpi 0,r7,0
681+ cmpdi 0,r7,0
682 beq 1f
683 li r6,-EFAULT
684 stw r6,0(r7)
685@@ -207,7 +207,7 @@
686
687 .globl dst_error
688 dst_error:
689- cmpi 0,r8,0
690+ cmpdi 0,r8,0
691 beq 1f
692 li r6,-EFAULT
693 stw r6,0(r8)
694diff -Nru a/arch/ppc64/mm/hash_low.S b/arch/ppc64/mm/hash_low.S
695--- a/arch/ppc64/mm/hash_low.S 2004-08-23 23:49:57 -07:00
696+++ b/arch/ppc64/mm/hash_low.S 2004-10-07 14:52:16 -07:00
697@@ -172,9 +172,9 @@
698 li r9,0
699 _GLOBAL(htab_call_hpte_insert1)
700 bl . /* Will be patched by htab_finish_init() */
701- cmpi 0,r3,0
702+ cmpdi 0,r3,0
703 bge htab_pte_insert_ok /* Insertion successful */
704- cmpi 0,r3,-2 /* Critical failure */
705+ cmpdi 0,r3,-2 /* Critical failure */
706 beq- htab_pte_insert_failure
707
708 /* Now try secondary slot */
709@@ -194,9 +194,9 @@
710 li r9,0
711 _GLOBAL(htab_call_hpte_insert2)
712 bl . /* Will be patched by htab_finish_init() */
713- cmpi 0,r3,0
714+ cmpdi 0,r3,0
715 bge+ htab_pte_insert_ok /* Insertion successful */
716- cmpi 0,r3,-2 /* Critical failure */
717+ cmpdi 0,r3,-2 /* Critical failure */
718 beq- htab_pte_insert_failure
719
720 /* Both are full, we need to evict something */
The Linux kernel (the core of the Linux operating system)
This page took 0.116871 seconds and 4 git commands to generate.