diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 16:42:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 16:42:28 -0400 |
commit | 55663219378eecd6fccb319be27ce6737a535e4c (patch) | |
tree | ff20fe50fa2e86ba09677a8b2cc7462ea11347a6 /arch/ppc/mm/hashtable.S | |
parent | a43266355b3d8cf6717a27159f9a417bdff73782 (diff) | |
parent | 58da10bb3fe680a197e83d5eccb5265a721c98e2 (diff) |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
* 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
[POWERPC] Fix Kconfig warning
[PPC] Fix modpost warning
[POWERPC] Fix modpost warning
[POWERPC] Fix Section mismatch warnings
[POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST
[POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic)
[PPC] Remove duplicate export of __div64_32.
[PPC] Fix COMMON symbol warnings
Diffstat (limited to 'arch/ppc/mm/hashtable.S')
-rw-r--r-- | arch/ppc/mm/hashtable.S | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/ppc/mm/hashtable.S b/arch/ppc/mm/hashtable.S index e756942e65c4..5f364dc50154 100644 --- a/arch/ppc/mm/hashtable.S +++ b/arch/ppc/mm/hashtable.S | |||
@@ -30,7 +30,11 @@ | |||
30 | #include <asm/asm-offsets.h> | 30 | #include <asm/asm-offsets.h> |
31 | 31 | ||
32 | #ifdef CONFIG_SMP | 32 | #ifdef CONFIG_SMP |
33 | .comm mmu_hash_lock,4 | 33 | .section .bss |
34 | .align 2 | ||
35 | .globl mmu_hash_lock | ||
36 | mmu_hash_lock: | ||
37 | .space 4 | ||
34 | #endif /* CONFIG_SMP */ | 38 | #endif /* CONFIG_SMP */ |
35 | 39 | ||
36 | /* | 40 | /* |
@@ -461,9 +465,17 @@ found_slot: | |||
461 | sync /* make sure pte updates get to memory */ | 465 | sync /* make sure pte updates get to memory */ |
462 | blr | 466 | blr |
463 | 467 | ||
464 | .comm next_slot,4 | 468 | .section .bss |
465 | .comm primary_pteg_full,4 | 469 | .align 2 |
466 | .comm htab_hash_searches,4 | 470 | next_slot: |
471 | .space 4 | ||
472 | .globl primary_pteg_full | ||
473 | primary_pteg_full: | ||
474 | .space 4 | ||
475 | .globl htab_hash_searches | ||
476 | htab_hash_searches: | ||
477 | .space 4 | ||
478 | .previous | ||
467 | 479 | ||
468 | /* | 480 | /* |
469 | * Flush the entry for a particular page from the hash table. | 481 | * Flush the entry for a particular page from the hash table. |