diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:49:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:49:55 -0400 |
| commit | 24665cd00dd06c741ef6268515ca9e6d3cda5c57 (patch) | |
| tree | d55e925db2b78bc6529965fa6b1df07a76b56610 /arch/ppc64/kernel/prom_init.c | |
| parent | fed2fc18a4567d613cd35115322257c6c6c710e9 (diff) | |
| parent | d7152fe14cad075d6dd4ee4194acd131aed0244e (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/prom_init.c')
| -rw-r--r-- | arch/ppc64/kernel/prom_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/prom_init.c b/arch/ppc64/kernel/prom_init.c index b7683abfbe6a..e248a7950aeb 100644 --- a/arch/ppc64/kernel/prom_init.c +++ b/arch/ppc64/kernel/prom_init.c | |||
| @@ -1915,9 +1915,9 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, unsigned long | |||
| 1915 | prom_send_capabilities(); | 1915 | prom_send_capabilities(); |
| 1916 | 1916 | ||
| 1917 | /* | 1917 | /* |
| 1918 | * On pSeries, copy the CPU hold code | 1918 | * On pSeries and BPA, copy the CPU hold code |
| 1919 | */ | 1919 | */ |
| 1920 | if (RELOC(of_platform) & PLATFORM_PSERIES) | 1920 | if (RELOC(of_platform) & (PLATFORM_PSERIES | PLATFORM_BPA)) |
| 1921 | copy_and_flush(0, KERNELBASE - offset, 0x100, 0); | 1921 | copy_and_flush(0, KERNELBASE - offset, 0x100, 0); |
| 1922 | 1922 | ||
| 1923 | /* | 1923 | /* |