diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 11:01:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 11:01:48 -0500 |
| commit | f885b51967fb5f611c462841e5119853df00cc97 (patch) | |
| tree | 29ba7f6eb9dd607980e63917e7f68e88578e7aca /include | |
| parent | 5d5d80001df3fbd06bd2b8893b6e3847e38a12d6 (diff) | |
| parent | dfbe0d3b6be52596b5694b1bb75b19562e769021 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix boot failure on POWER6
[POWERPC] Workaround for iommu page alignment
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/mmu-hash64.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-powerpc/mmu-hash64.h b/include/asm-powerpc/mmu-hash64.h index 951e2487aa69..82328dec2b52 100644 --- a/include/asm-powerpc/mmu-hash64.h +++ b/include/asm-powerpc/mmu-hash64.h | |||
| @@ -286,7 +286,6 @@ extern void hpte_init_iSeries(void); | |||
| 286 | extern void hpte_init_beat(void); | 286 | extern void hpte_init_beat(void); |
| 287 | extern void hpte_init_beat_v3(void); | 287 | extern void hpte_init_beat_v3(void); |
| 288 | 288 | ||
| 289 | extern void slb_shadow_clear_all(void); | ||
| 290 | extern void stabs_alloc(void); | 289 | extern void stabs_alloc(void); |
| 291 | extern void slb_initialize(void); | 290 | extern void slb_initialize(void); |
| 292 | extern void slb_flush_and_rebolt(void); | 291 | extern void slb_flush_and_rebolt(void); |