diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 14:01:25 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 14:01:25 +0200 |
| commit | d7f6884ae0ae6e406ec3500fcde16e8f51642460 (patch) | |
| tree | efceb246a4fa12921b7dbd3946a88fa257684405 /arch/ppc64/kernel/pacaData.c | |
| parent | [PATCH] sky2: new experimental Marvell Yukon2 driver (diff) | |
| parent | Linux 2.6.14-rc1 (diff) | |
| download | linux-d7f6884ae0ae6e406ec3500fcde16e8f51642460.tar.xz linux-d7f6884ae0ae6e406ec3500fcde16e8f51642460.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc64/kernel/pacaData.c')
| -rw-r--r-- | arch/ppc64/kernel/pacaData.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/pacaData.c b/arch/ppc64/kernel/pacaData.c index 6316188737b6..33a2d8db3f21 100644 --- a/arch/ppc64/kernel/pacaData.c +++ b/arch/ppc64/kernel/pacaData.c @@ -59,6 +59,7 @@ extern unsigned long __toc_start; .fpregs_in_use = 1, \ .end_of_quantum = 0xfffffffffffffffful, \ .slb_count = 64, \ + .vmxregs_in_use = 0, \ }, \ #ifdef CONFIG_PPC_ISERIES @@ -78,7 +79,7 @@ extern unsigned long __toc_start; #define BOOTCPU_PACA_INIT(number) \ { \ - PACA_INIT_COMMON(number, 1, 0, STAB0_VIRT_ADDR) \ + PACA_INIT_COMMON(number, 1, 0, (u64)&initial_stab) \ PACA_INIT_ISERIES(number) \ } @@ -90,7 +91,7 @@ extern unsigned long __toc_start; #define BOOTCPU_PACA_INIT(number) \ { \ - PACA_INIT_COMMON(number, 1, STAB0_PHYS_ADDR, STAB0_VIRT_ADDR) \ + PACA_INIT_COMMON(number, 1, STAB0_PHYS_ADDR, (u64)&initial_stab) \ } #endif |