diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 13:01:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 13:01:45 -0500 |
| commit | fd4be699b5b6b1744c9b0736d991ccfb35eea575 (patch) | |
| tree | bdccb54bef111c341c5cfcf02e1c1c722b24666d /include | |
| parent | 417009f64f17d76322d148a2cda40dfec37bcf0b (diff) | |
| parent | 473980a99316c0e788bca50996375a2815124ce1 (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 CPU hotplug when using the SLB shadow buffer
[POWERPC] efika: add phy-handle property for fec_mpc52xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/mmu-hash64.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/mmu-hash64.h b/include/asm-powerpc/mmu-hash64.h index 82328dec2b52..951e2487aa69 100644 --- a/include/asm-powerpc/mmu-hash64.h +++ b/include/asm-powerpc/mmu-hash64.h | |||
| @@ -286,6 +286,7 @@ 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); | ||
| 289 | extern void stabs_alloc(void); | 290 | extern void stabs_alloc(void); |
| 290 | extern void slb_initialize(void); | 291 | extern void slb_initialize(void); |
| 291 | extern void slb_flush_and_rebolt(void); | 292 | extern void slb_flush_and_rebolt(void); |