Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 56591
b: refs/heads/master
c: 991eb43
h: refs/heads/master
i:
  56589: b87a54b
  56587: 6b13a0d
  56583: 8420c0a
  56575: 195f9a7
v: v3
  • Loading branch information
Kumar Gala authored and Paul Mackerras committed May 17, 2007
1 parent 59a5565 commit fb20c33
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 40ebbcbf23d5592f58712fca2ab406ff818e2d65
refs/heads/master: 991eb43af989002d5c7f4a2ff2a6c806a912b51b
18 changes: 15 additions & 3 deletions trunk/arch/powerpc/kernel/entry_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,11 @@ fast_exception_return:
mr r12,r4 /* restart at exc_exit_restart */
b 2b

.comm fee_restarts,4
.section .bss
.align 2
fee_restarts:
.space 4
.previous

/* aargh, a nonrecoverable interrupt, panic */
/* aargh, we don't know which trap this is */
Expand Down Expand Up @@ -851,7 +855,11 @@ load_dbcr0:
mtspr SPRN_DBSR,r11 /* clear all pending debug events */
blr

.comm global_dbcr0,8
.section .bss
.align 4
global_dbcr0:
.space 8
.previous
#endif /* !(CONFIG_4xx || CONFIG_BOOKE) */

do_work: /* r10 contains MSR_KERNEL here */
Expand Down Expand Up @@ -926,7 +934,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
/* shouldn't return */
b 4b

.comm ee_restarts,4
.section .bss
.align 2
ee_restarts:
.space 4
.previous

/*
* PROM code for specific machines follows. Put it
Expand Down
18 changes: 14 additions & 4 deletions trunk/arch/powerpc/mm/hash_low_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@
#include <asm/asm-offsets.h>

#ifdef CONFIG_SMP
.comm mmu_hash_lock,4
.section .bss
.align 2
.globl mmu_hash_lock
mmu_hash_lock:
.space 4
#endif /* CONFIG_SMP */

/*
Expand Down Expand Up @@ -455,9 +459,15 @@ found_slot:
sync /* make sure pte updates get to memory */
blr

.comm next_slot,4
.comm primary_pteg_full,4
.comm htab_hash_searches,4
.section .bss
.align 2
next_slot:
.space 4
primary_pteg_full:
.space 4
htab_hash_searches:
.space 4
.previous

/*
* Flush the entry for a particular page from the hash table.
Expand Down

0 comments on commit fb20c33

Please sign in to comment.