diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2005-08-19 00:52:32 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-08-28 20:53:34 -0400 |
| commit | 1d086e6bd605ac44154e019fe96ae3568e8b2ba2 (patch) | |
| tree | 02143cb69ab39a8d3c54e7444ff79836282517a7 | |
| parent | 60ba44945714d9b7dae8b85ab0926f6f13809c73 (diff) | |
[PATCH] Remove unneeded #defines in head.S
arch/ppc64/kernel/head.S #defines SECONDARY_PROCESSORS then has some
#ifdefs based on it. Whatever purpose this had is long lost, this
patch removes it.
Likewise, head.S defines H_SET_ASR, which is now defined, along with
other hypervisor call numbers in hvcall.h. This patch deletes it, as
well, from head.S.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/ppc64/kernel/head.S | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index 1cc9f203c22f..bf2345eb133c 100644 --- a/arch/ppc64/kernel/head.S +++ b/arch/ppc64/kernel/head.S | |||
| @@ -23,8 +23,6 @@ | |||
| 23 | * 2 of the License, or (at your option) any later version. | 23 | * 2 of the License, or (at your option) any later version. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #define SECONDARY_PROCESSORS | ||
| 27 | |||
| 28 | #include <linux/config.h> | 26 | #include <linux/config.h> |
| 29 | #include <linux/threads.h> | 27 | #include <linux/threads.h> |
| 30 | #include <asm/processor.h> | 28 | #include <asm/processor.h> |
| @@ -44,11 +42,6 @@ | |||
| 44 | #endif | 42 | #endif |
| 45 | 43 | ||
| 46 | /* | 44 | /* |
| 47 | * hcall interface to pSeries LPAR | ||
| 48 | */ | ||
| 49 | #define H_SET_ASR 0x30 | ||
| 50 | |||
| 51 | /* | ||
| 52 | * We layout physical memory as follows: | 45 | * We layout physical memory as follows: |
| 53 | * 0x0000 - 0x00ff : Secondary processor spin code | 46 | * 0x0000 - 0x00ff : Secondary processor spin code |
| 54 | * 0x0100 - 0x2fff : pSeries Interrupt prologs | 47 | * 0x0100 - 0x2fff : pSeries Interrupt prologs |
| @@ -629,9 +622,7 @@ system_reset_iSeries: | |||
| 629 | 622 | ||
| 630 | cmpwi 0,r23,0 | 623 | cmpwi 0,r23,0 |
| 631 | beq iSeries_secondary_smp_loop /* Loop until told to go */ | 624 | beq iSeries_secondary_smp_loop /* Loop until told to go */ |
| 632 | #ifdef SECONDARY_PROCESSORS | ||
| 633 | bne .__secondary_start /* Loop until told to go */ | 625 | bne .__secondary_start /* Loop until told to go */ |
| 634 | #endif | ||
| 635 | iSeries_secondary_smp_loop: | 626 | iSeries_secondary_smp_loop: |
| 636 | /* Let the Hypervisor know we are alive */ | 627 | /* Let the Hypervisor know we are alive */ |
| 637 | /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */ | 628 | /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */ |
| @@ -1325,10 +1316,8 @@ _GLOBAL(pSeries_secondary_smp_init) | |||
| 1325 | 1316 | ||
| 1326 | cmpwi 0,r23,0 | 1317 | cmpwi 0,r23,0 |
| 1327 | #ifdef CONFIG_SMP | 1318 | #ifdef CONFIG_SMP |
| 1328 | #ifdef SECONDARY_PROCESSORS | ||
| 1329 | bne .__secondary_start | 1319 | bne .__secondary_start |
| 1330 | #endif | 1320 | #endif |
| 1331 | #endif | ||
| 1332 | b 3b /* Loop until told to go */ | 1321 | b 3b /* Loop until told to go */ |
| 1333 | 1322 | ||
| 1334 | #ifdef CONFIG_PPC_ISERIES | 1323 | #ifdef CONFIG_PPC_ISERIES |
